Merge "Make asan more closely match clang behavior."