This reverts commit 22819276. Test: SANITIZE_TARGET=address build should keep working Change-Id: I84f7868482b2ba3c8fc5ad5250b17b576cb7f392