This reverts commit 9a8dcea0. Reason for revert: Causing the oatdump_app_test gtest failure over several builds. Change-Id: I5b985fc701183415529f636cf2e39ed46031ff59