This reverts commit 8960b0ba. Bug: 34066768 Test: make -j32 test-art-host Change-Id: Ifeb22d1e909d31ac6dd31bc0a66bab41ccb53425