This reverts commit 8d8253f525.
Reason for revert: Breaks ART gtests e.g. https://android-build.corp.google.com/build_explorer/build_details/12016159/art-gtest/
Change-Id: Ie8e1a28c7d0a21ee6727954127a6ab00ed00e781
This reverts commit 8d8253f525.
Reason for revert: Breaks ART gtests e.g. https://android-build.corp.google.com/build_explorer/build_details/12016159/art-gtest/
Change-Id: Ie8e1a28c7d0a21ee6727954127a6ab00ed00e781