Merge "Make host valgrind work with clang/llvm." am: 5318c4000d am: 9a25385f22 am: d8fe08f246
am: 450d005806

Change-Id: I16b1517ba610b7da62d38e68025463bda25be81e