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

Change-Id: Ia8793d602d6bbf522c8edac6a2bec8b932f3f4b5