Merge "Re-enable asan on /init." am: 9c334367fd am: 17d5f8ad20
am: 18589dbbb0

Change-Id: I381f49e2d7fc829f357d38d134a30bfaa46ca911