This reverts commit 2a9d198b. Test: mma -j40 test-art-host Test: ART_TEST_RUN_TEST_NDEBUG=true mma -j40 test-art-host Change-Id: I14bfd02f74f93e4a6b853287fcaa69f1fb027256