This reverts commit 259eaab3. Reason for revert: breaks hwasan + gcov Bug: 135298400 Change-Id: Ie8574753f9237a55ad1618783bd5150ffb646015