Merge "Re-enable asan on /init."
am: 9c334367fd

Change-Id: I2fc6aee86292034ae32136f430d5de3ae5d9c448