Merge "Make host valgrind work with clang/llvm."
am: 5318c4000d

Change-Id: I1de04daddfc2446b19e8723806f4733f92b78fee