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

Change-Id: Ie3c3a3a65090dcaf6e242f0c0b08251e3951cfa2