This reverts commit 02edc100. Reason for revert: Breaks test_suites_x86_64_coverage Bug: 233421462 Change-Id: I7b04d3fd7802be0f271ea3c29ef25e3d08ab1389