Merge "Never add asan libraries to NDK code"