This reverts commit a79f8ab7. Reason for revert: Breaks fugu-debug. See go/art-build. Change-Id: Iaa89aee8cc72941163794918ab85851a6f755ff9