Merge \\"Never add asan libraries to NDK code\\" am: 59a405c831
am: 83de5d619a

Change-Id: Idbc5a8016d8ea02a7c960f350b411814b67e6c2e