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

Change-Id: I36232326fbd18d6d8e065f2fd133c3a7ad6cd8b9