Merge "Temporary fix for asan_malloc_linux.cc build failure."