This reverts commit 10ed3ddd. Reason for revert: problem found in clang-r377782 Bug: 149157191 Change-Id: I20cde351f44d241c5c65f9cfbfbb37d45c15f724