Update Valgrind location after we stopped checking out Chromium.

The changes in https://codereview.webrtc.org/2594363002 contained
incorrect paths.

BUG=webrtc:5006
TBR=ehmaldonado@webrtc.org

Review-Url: https://codereview.webrtc.org/2605533002 .
Cr-Commit-Position: refs/heads/master@{#15772}
diff --git a/tools-webrtc/valgrind/valgrind-binaries.gni b/tools-webrtc/valgrind/valgrind-binaries.gni
index f78ba5f..26ca7e2 100644
--- a/tools-webrtc/valgrind/valgrind-binaries.gni
+++ b/tools-webrtc/valgrind/valgrind-binaries.gni
@@ -10,416 +10,416 @@
 
 if (is_mac) {
   valgrind_binaries += [
-    "../../src/third_party/valgrind/mac_10.6/bin/ms_print",
-    "../../src/third_party/valgrind/mac_10.6/bin/no_op_client_for_valgrind",
-    "../../src/third_party/valgrind/mac_10.6/bin/valgrind",
-    "../../src/third_party/valgrind/mac_10.6/bin/valgrind-listener",
-    "../../src/third_party/valgrind/mac_10.6/bin/vgdb",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/32bit-core-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/32bit-core-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/32bit-core.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/32bit-linux-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/32bit-linux-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/32bit-linux.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/32bit-sse-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/32bit-sse-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/32bit-sse.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/64bit-avx-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/64bit-avx-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/64bit-avx.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/64bit-core-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/64bit-core-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/64bit-core.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/64bit-linux-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/64bit-linux-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/64bit-linux.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/64bit-sse-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/64bit-sse-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/64bit-sse.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/amd64-avx-coresse-valgrind.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/amd64-avx-coresse.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/amd64-avx-linux-valgrind.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/amd64-avx-linux.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/amd64-coresse-valgrind.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/amd64-linux-valgrind.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/arm-core-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/arm-core-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/arm-core.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/arm-vfpv3-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/arm-vfpv3-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/arm-vfpv3.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/arm-with-vfpv3-valgrind.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/arm-with-vfpv3.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/default.supp",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/i386-coresse-valgrind.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/i386-linux-valgrind.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/libmpiwrap-amd64-darwin.so",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/libmpiwrap-amd64-darwin.so.dSYM/Contents/Info.plist",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/libmpiwrap-amd64-darwin.so.dSYM/Contents/Resources/DWARF/libmpiwrap-amd64-darwin.so",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/libmpiwrap-x86-darwin.so",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/libmpiwrap-x86-darwin.so.dSYM/Contents/Info.plist",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/libmpiwrap-x86-darwin.so.dSYM/Contents/Resources/DWARF/libmpiwrap-x86-darwin.so",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/memcheck-amd64-darwin",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/memcheck-amd64-darwin.dSYM/Contents/Info.plist",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/memcheck-amd64-darwin.dSYM/Contents/Resources/DWARF/memcheck-amd64-darwin",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/memcheck-x86-darwin",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/memcheck-x86-darwin.dSYM/Contents/Info.plist",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/memcheck-x86-darwin.dSYM/Contents/Resources/DWARF/memcheck-x86-darwin",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/mips-cp0-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/mips-cp0-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/mips-cp0.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/mips-cpu-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/mips-cpu-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/mips-cpu.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/mips-fpu-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/mips-fpu-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/mips-fpu.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/mips-linux-valgrind.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/mips-linux.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/power-altivec-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/power-altivec-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/power-altivec.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/power-core-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/power-core-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/power-core.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/power-fpu-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/power-fpu-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/power-fpu.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/power-linux-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/power-linux-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/power-linux.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/power64-core-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/power64-core-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/power64-core.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/power64-linux-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/power64-linux-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/power64-linux.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/powerpc-altivec32l-valgrind.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/powerpc-altivec32l.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/powerpc-altivec64l-valgrind.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/powerpc-altivec64l.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/s390-acr-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/s390-acr-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/s390-acr.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/s390-fpr-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/s390-fpr-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/s390-fpr.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/s390x-core64-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/s390x-core64-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/s390x-core64.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/s390x-generic-valgrind.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/s390x-generic.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/s390x-linux64-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/s390x-linux64-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/s390x-linux64.xml",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_core-amd64-darwin.so",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_core-amd64-darwin.so.dSYM/Contents/Info.plist",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_core-amd64-darwin.so.dSYM/Contents/Resources/DWARF/vgpreload_core-amd64-darwin.so",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_core-x86-darwin.so",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_core-x86-darwin.so.dSYM/Contents/Info.plist",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_core-x86-darwin.so.dSYM/Contents/Resources/DWARF/vgpreload_core-x86-darwin.so",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_memcheck-amd64-darwin.so",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_memcheck-amd64-darwin.so.dSYM/Contents/Info.plist",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_memcheck-amd64-darwin.so.dSYM/Contents/Resources/DWARF/vgpreload_memcheck-amd64-darwin.so",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_memcheck-x86-darwin.so",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_memcheck-x86-darwin.so.dSYM/Contents/Info.plist",
-    "../../src/third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_memcheck-x86-darwin.so.dSYM/Contents/Resources/DWARF/vgpreload_memcheck-x86-darwin.so",
-    "../../src/third_party/valgrind/mac_10.7/bin/valgrind",
-    "../../src/third_party/valgrind/mac_10.7/bin/valgrind-listener",
-    "../../src/third_party/valgrind/mac_10.7/bin/vgdb",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/32bit-core-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/32bit-core-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/32bit-core.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/32bit-linux-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/32bit-linux-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/32bit-linux.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/32bit-sse-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/32bit-sse-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/32bit-sse.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/64bit-avx-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/64bit-avx-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/64bit-avx.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/64bit-core-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/64bit-core-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/64bit-core.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/64bit-linux-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/64bit-linux-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/64bit-linux.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/64bit-sse-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/64bit-sse-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/64bit-sse.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/amd64-avx-coresse-valgrind.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/amd64-avx-coresse.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/amd64-avx-linux-valgrind.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/amd64-avx-linux.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/amd64-coresse-valgrind.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/amd64-linux-valgrind.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/arm-core-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/arm-core-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/arm-core.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/arm-vfpv3-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/arm-vfpv3-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/arm-vfpv3.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/arm-with-vfpv3-valgrind.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/arm-with-vfpv3.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/default.supp",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/i386-coresse-valgrind.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/i386-linux-valgrind.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/memcheck-amd64-darwin",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/memcheck-amd64-darwin.dSYM/Contents/Info.plist",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/memcheck-amd64-darwin.dSYM/Contents/Resources/DWARF/memcheck-amd64-darwin",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/memcheck-x86-darwin",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/memcheck-x86-darwin.dSYM/Contents/Info.plist",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/memcheck-x86-darwin.dSYM/Contents/Resources/DWARF/memcheck-x86-darwin",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/mips-cp0-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/mips-cp0-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/mips-cp0.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/mips-cpu-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/mips-cpu-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/mips-cpu.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/mips-fpu-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/mips-fpu-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/mips-fpu.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/mips-linux-valgrind.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/mips-linux.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/power-altivec-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/power-altivec-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/power-altivec.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/power-core-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/power-core-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/power-core.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/power-fpu-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/power-fpu-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/power-fpu.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/power-linux-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/power-linux-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/power-linux.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/power64-core-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/power64-core-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/power64-core.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/power64-linux-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/power64-linux-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/power64-linux.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/powerpc-altivec32l-valgrind.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/powerpc-altivec32l.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/powerpc-altivec64l-valgrind.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/powerpc-altivec64l.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/s390-acr-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/s390-acr-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/s390-acr.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/s390-fpr-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/s390-fpr-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/s390-fpr.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/s390x-core64-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/s390x-core64-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/s390x-core64.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/s390x-generic-valgrind.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/s390x-generic.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/s390x-linux64-valgrind-s1.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/s390x-linux64-valgrind-s2.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/s390x-linux64.xml",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/vgpreload_core-amd64-darwin.so.dSYM/Contents/Info.plist",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/vgpreload_core-x86-darwin.so.dSYM/Contents/Info.plist",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/vgpreload_memcheck-amd64-darwin.so.dSYM/Contents/Info.plist",
-    "../../src/third_party/valgrind/mac_10.7/lib/valgrind/vgpreload_memcheck-x86-darwin.so.dSYM/Contents/Info.plist",
+    "../../third_party/valgrind/mac_10.6/bin/ms_print",
+    "../../third_party/valgrind/mac_10.6/bin/no_op_client_for_valgrind",
+    "../../third_party/valgrind/mac_10.6/bin/valgrind",
+    "../../third_party/valgrind/mac_10.6/bin/valgrind-listener",
+    "../../third_party/valgrind/mac_10.6/bin/vgdb",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/32bit-core-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/32bit-core-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/32bit-core.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/32bit-linux-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/32bit-linux-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/32bit-linux.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/32bit-sse-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/32bit-sse-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/32bit-sse.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/64bit-avx-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/64bit-avx-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/64bit-avx.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/64bit-core-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/64bit-core-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/64bit-core.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/64bit-linux-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/64bit-linux-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/64bit-linux.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/64bit-sse-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/64bit-sse-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/64bit-sse.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/amd64-avx-coresse-valgrind.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/amd64-avx-coresse.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/amd64-avx-linux-valgrind.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/amd64-avx-linux.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/amd64-coresse-valgrind.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/amd64-linux-valgrind.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/arm-core-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/arm-core-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/arm-core.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/arm-vfpv3-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/arm-vfpv3-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/arm-vfpv3.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/arm-with-vfpv3-valgrind.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/arm-with-vfpv3.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/default.supp",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/i386-coresse-valgrind.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/i386-linux-valgrind.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/libmpiwrap-amd64-darwin.so",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/libmpiwrap-amd64-darwin.so.dSYM/Contents/Info.plist",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/libmpiwrap-amd64-darwin.so.dSYM/Contents/Resources/DWARF/libmpiwrap-amd64-darwin.so",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/libmpiwrap-x86-darwin.so",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/libmpiwrap-x86-darwin.so.dSYM/Contents/Info.plist",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/libmpiwrap-x86-darwin.so.dSYM/Contents/Resources/DWARF/libmpiwrap-x86-darwin.so",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/memcheck-amd64-darwin",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/memcheck-amd64-darwin.dSYM/Contents/Info.plist",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/memcheck-amd64-darwin.dSYM/Contents/Resources/DWARF/memcheck-amd64-darwin",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/memcheck-x86-darwin",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/memcheck-x86-darwin.dSYM/Contents/Info.plist",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/memcheck-x86-darwin.dSYM/Contents/Resources/DWARF/memcheck-x86-darwin",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/mips-cp0-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/mips-cp0-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/mips-cp0.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/mips-cpu-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/mips-cpu-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/mips-cpu.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/mips-fpu-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/mips-fpu-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/mips-fpu.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/mips-linux-valgrind.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/mips-linux.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/power-altivec-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/power-altivec-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/power-altivec.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/power-core-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/power-core-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/power-core.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/power-fpu-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/power-fpu-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/power-fpu.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/power-linux-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/power-linux-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/power-linux.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/power64-core-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/power64-core-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/power64-core.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/power64-linux-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/power64-linux-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/power64-linux.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/powerpc-altivec32l-valgrind.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/powerpc-altivec32l.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/powerpc-altivec64l-valgrind.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/powerpc-altivec64l.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/s390-acr-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/s390-acr-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/s390-acr.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/s390-fpr-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/s390-fpr-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/s390-fpr.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/s390x-core64-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/s390x-core64-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/s390x-core64.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/s390x-generic-valgrind.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/s390x-generic.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/s390x-linux64-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/s390x-linux64-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/s390x-linux64.xml",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_core-amd64-darwin.so",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_core-amd64-darwin.so.dSYM/Contents/Info.plist",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_core-amd64-darwin.so.dSYM/Contents/Resources/DWARF/vgpreload_core-amd64-darwin.so",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_core-x86-darwin.so",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_core-x86-darwin.so.dSYM/Contents/Info.plist",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_core-x86-darwin.so.dSYM/Contents/Resources/DWARF/vgpreload_core-x86-darwin.so",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_memcheck-amd64-darwin.so",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_memcheck-amd64-darwin.so.dSYM/Contents/Info.plist",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_memcheck-amd64-darwin.so.dSYM/Contents/Resources/DWARF/vgpreload_memcheck-amd64-darwin.so",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_memcheck-x86-darwin.so",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_memcheck-x86-darwin.so.dSYM/Contents/Info.plist",
+    "../../third_party/valgrind/mac_10.6/lib/valgrind/vgpreload_memcheck-x86-darwin.so.dSYM/Contents/Resources/DWARF/vgpreload_memcheck-x86-darwin.so",
+    "../../third_party/valgrind/mac_10.7/bin/valgrind",
+    "../../third_party/valgrind/mac_10.7/bin/valgrind-listener",
+    "../../third_party/valgrind/mac_10.7/bin/vgdb",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/32bit-core-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/32bit-core-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/32bit-core.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/32bit-linux-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/32bit-linux-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/32bit-linux.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/32bit-sse-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/32bit-sse-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/32bit-sse.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/64bit-avx-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/64bit-avx-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/64bit-avx.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/64bit-core-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/64bit-core-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/64bit-core.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/64bit-linux-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/64bit-linux-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/64bit-linux.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/64bit-sse-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/64bit-sse-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/64bit-sse.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/amd64-avx-coresse-valgrind.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/amd64-avx-coresse.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/amd64-avx-linux-valgrind.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/amd64-avx-linux.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/amd64-coresse-valgrind.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/amd64-linux-valgrind.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/arm-core-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/arm-core-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/arm-core.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/arm-vfpv3-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/arm-vfpv3-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/arm-vfpv3.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/arm-with-vfpv3-valgrind.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/arm-with-vfpv3.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/default.supp",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/i386-coresse-valgrind.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/i386-linux-valgrind.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/memcheck-amd64-darwin",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/memcheck-amd64-darwin.dSYM/Contents/Info.plist",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/memcheck-amd64-darwin.dSYM/Contents/Resources/DWARF/memcheck-amd64-darwin",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/memcheck-x86-darwin",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/memcheck-x86-darwin.dSYM/Contents/Info.plist",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/memcheck-x86-darwin.dSYM/Contents/Resources/DWARF/memcheck-x86-darwin",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/mips-cp0-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/mips-cp0-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/mips-cp0.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/mips-cpu-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/mips-cpu-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/mips-cpu.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/mips-fpu-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/mips-fpu-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/mips-fpu.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/mips-linux-valgrind.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/mips-linux.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/power-altivec-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/power-altivec-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/power-altivec.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/power-core-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/power-core-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/power-core.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/power-fpu-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/power-fpu-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/power-fpu.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/power-linux-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/power-linux-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/power-linux.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/power64-core-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/power64-core-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/power64-core.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/power64-linux-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/power64-linux-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/power64-linux.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/powerpc-altivec32l-valgrind.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/powerpc-altivec32l.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/powerpc-altivec64l-valgrind.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/powerpc-altivec64l.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/s390-acr-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/s390-acr-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/s390-acr.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/s390-fpr-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/s390-fpr-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/s390-fpr.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/s390x-core64-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/s390x-core64-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/s390x-core64.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/s390x-generic-valgrind.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/s390x-generic.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/s390x-linux64-valgrind-s1.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/s390x-linux64-valgrind-s2.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/s390x-linux64.xml",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/vgpreload_core-amd64-darwin.so.dSYM/Contents/Info.plist",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/vgpreload_core-x86-darwin.so.dSYM/Contents/Info.plist",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/vgpreload_memcheck-amd64-darwin.so.dSYM/Contents/Info.plist",
+    "../../third_party/valgrind/mac_10.7/lib/valgrind/vgpreload_memcheck-x86-darwin.so.dSYM/Contents/Info.plist",
   ]
 } else if (is_linux) {
   if (target_cpu == "x64") {
     valgrind_binaries += [
-      "../../src/third_party/valgrind/linux_x64/bin/ms_print",
-      "../../src/third_party/valgrind/linux_x64/bin/no_op_client_for_valgrind",
-      "../../src/third_party/valgrind/linux_x64/bin/valgrind",
-      "../../src/third_party/valgrind/linux_x64/bin/valgrind-listener",
-      "../../src/third_party/valgrind/linux_x64/bin/valgrind-tsan.sh",
-      "../../src/third_party/valgrind/linux_x64/bin/vgdb",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/32bit-core-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/32bit-core-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/32bit-core.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/32bit-linux-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/32bit-linux-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/32bit-linux.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/32bit-sse-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/32bit-sse-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/32bit-sse.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/64bit-avx-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/64bit-avx-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/64bit-avx.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/64bit-core-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/64bit-core-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/64bit-core.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/64bit-linux-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/64bit-linux-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/64bit-linux.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/64bit-sse-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/64bit-sse-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/64bit-sse.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/amd64-avx-coresse-valgrind.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/amd64-avx-coresse.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/amd64-avx-linux-valgrind.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/amd64-avx-linux.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/amd64-coresse-valgrind.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/amd64-linux-valgrind.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/arm-core-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/arm-core-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/arm-core.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/arm-vfpv3-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/arm-vfpv3-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/arm-vfpv3.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/arm-with-vfpv3-valgrind.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/arm-with-vfpv3.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/default.supp",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/i386-coresse-valgrind.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/i386-linux-valgrind.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/memcheck-amd64-linux",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/memcheck-x86-linux",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/mips-cp0-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/mips-cp0-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/mips-cp0.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/mips-cpu-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/mips-cpu-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/mips-cpu.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/mips-fpu-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/mips-fpu-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/mips-fpu.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/mips-linux-valgrind.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/mips-linux.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/power-altivec-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/power-altivec-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/power-altivec.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/power-core-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/power-core-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/power-core.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/power-fpu-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/power-fpu-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/power-fpu.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/power-linux-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/power-linux-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/power-linux.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/power64-core-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/power64-core-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/power64-core.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/power64-linux-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/power64-linux-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/power64-linux.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/powerpc-altivec32l-valgrind.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/powerpc-altivec32l.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/powerpc-altivec64l-valgrind.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/powerpc-altivec64l.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/s390-acr-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/s390-acr-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/s390-acr.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/s390-fpr-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/s390-fpr-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/s390-fpr.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/s390x-core64-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/s390x-core64-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/s390x-core64.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/s390x-generic-valgrind.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/s390x-generic.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/s390x-linux64-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/s390x-linux64-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/s390x-linux64.xml",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/vgpreload_core-amd64-linux.so",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/vgpreload_core-x86-linux.so",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/vgpreload_memcheck-amd64-linux.so",
-      "../../src/third_party/valgrind/linux_x64/lib/valgrind/vgpreload_memcheck-x86-linux.so",
+      "../../third_party/valgrind/linux_x64/bin/ms_print",
+      "../../third_party/valgrind/linux_x64/bin/no_op_client_for_valgrind",
+      "../../third_party/valgrind/linux_x64/bin/valgrind",
+      "../../third_party/valgrind/linux_x64/bin/valgrind-listener",
+      "../../third_party/valgrind/linux_x64/bin/valgrind-tsan.sh",
+      "../../third_party/valgrind/linux_x64/bin/vgdb",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/32bit-core-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/32bit-core-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/32bit-core.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/32bit-linux-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/32bit-linux-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/32bit-linux.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/32bit-sse-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/32bit-sse-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/32bit-sse.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/64bit-avx-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/64bit-avx-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/64bit-avx.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/64bit-core-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/64bit-core-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/64bit-core.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/64bit-linux-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/64bit-linux-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/64bit-linux.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/64bit-sse-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/64bit-sse-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/64bit-sse.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/amd64-avx-coresse-valgrind.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/amd64-avx-coresse.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/amd64-avx-linux-valgrind.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/amd64-avx-linux.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/amd64-coresse-valgrind.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/amd64-linux-valgrind.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/arm-core-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/arm-core-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/arm-core.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/arm-vfpv3-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/arm-vfpv3-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/arm-vfpv3.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/arm-with-vfpv3-valgrind.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/arm-with-vfpv3.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/default.supp",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/i386-coresse-valgrind.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/i386-linux-valgrind.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/memcheck-amd64-linux",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/memcheck-x86-linux",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/mips-cp0-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/mips-cp0-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/mips-cp0.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/mips-cpu-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/mips-cpu-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/mips-cpu.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/mips-fpu-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/mips-fpu-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/mips-fpu.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/mips-linux-valgrind.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/mips-linux.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/power-altivec-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/power-altivec-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/power-altivec.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/power-core-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/power-core-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/power-core.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/power-fpu-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/power-fpu-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/power-fpu.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/power-linux-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/power-linux-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/power-linux.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/power64-core-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/power64-core-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/power64-core.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/power64-linux-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/power64-linux-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/power64-linux.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/powerpc-altivec32l-valgrind.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/powerpc-altivec32l.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/powerpc-altivec64l-valgrind.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/powerpc-altivec64l.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/s390-acr-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/s390-acr-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/s390-acr.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/s390-fpr-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/s390-fpr-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/s390-fpr.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/s390x-core64-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/s390x-core64-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/s390x-core64.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/s390x-generic-valgrind.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/s390x-generic.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/s390x-linux64-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/s390x-linux64-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/s390x-linux64.xml",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/vgpreload_core-amd64-linux.so",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/vgpreload_core-x86-linux.so",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/vgpreload_memcheck-amd64-linux.so",
+      "../../third_party/valgrind/linux_x64/lib/valgrind/vgpreload_memcheck-x86-linux.so",
     ]
   } else if (target_cpu == "x86") {
     valgrind_binaries += [
-      "../../src/third_party/valgrind/linux_x86/bin/ms_print",
-      "../../src/third_party/valgrind/linux_x86/bin/no_op_client_for_valgrind",
-      "../../src/third_party/valgrind/linux_x86/bin/valgrind",
-      "../../src/third_party/valgrind/linux_x86/bin/valgrind-listener",
-      "../../src/third_party/valgrind/linux_x86/bin/valgrind-tsan.sh",
-      "../../src/third_party/valgrind/linux_x86/bin/vgdb",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/32bit-core-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/32bit-core-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/32bit-core.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/32bit-linux-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/32bit-linux-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/32bit-linux.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/32bit-sse-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/32bit-sse-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/32bit-sse.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/64bit-avx-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/64bit-avx-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/64bit-avx.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/64bit-core-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/64bit-core-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/64bit-core.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/64bit-linux-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/64bit-linux-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/64bit-linux.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/64bit-sse-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/64bit-sse-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/64bit-sse.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/amd64-avx-coresse-valgrind.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/amd64-avx-coresse.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/amd64-avx-linux-valgrind.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/amd64-avx-linux.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/amd64-coresse-valgrind.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/amd64-linux-valgrind.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/arm-core-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/arm-core-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/arm-core.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/arm-vfpv3-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/arm-vfpv3-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/arm-vfpv3.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/arm-with-vfpv3-valgrind.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/arm-with-vfpv3.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/default.supp",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/i386-coresse-valgrind.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/i386-linux-valgrind.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/memcheck-x86-linux",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/mips-cp0-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/mips-cp0-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/mips-cp0.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/mips-cpu-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/mips-cpu-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/mips-cpu.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/mips-fpu-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/mips-fpu-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/mips-fpu.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/mips-linux-valgrind.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/mips-linux.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/power-altivec-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/power-altivec-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/power-altivec.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/power-core-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/power-core-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/power-core.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/power-fpu-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/power-fpu-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/power-fpu.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/power-linux-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/power-linux-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/power-linux.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/power64-core-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/power64-core-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/power64-core.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/power64-linux-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/power64-linux-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/power64-linux.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/powerpc-altivec32l-valgrind.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/powerpc-altivec32l.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/powerpc-altivec64l-valgrind.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/powerpc-altivec64l.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/s390-acr-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/s390-acr-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/s390-acr.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/s390-fpr-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/s390-fpr-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/s390-fpr.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/s390x-core64-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/s390x-core64-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/s390x-core64.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/s390x-generic-valgrind.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/s390x-generic.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/s390x-linux64-valgrind-s1.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/s390x-linux64-valgrind-s2.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/s390x-linux64.xml",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/vgpreload_core-x86-linux.so",
-      "../../src/third_party/valgrind/linux_x86/lib/valgrind/vgpreload_memcheck-x86-linux.so",
+      "../../third_party/valgrind/linux_x86/bin/ms_print",
+      "../../third_party/valgrind/linux_x86/bin/no_op_client_for_valgrind",
+      "../../third_party/valgrind/linux_x86/bin/valgrind",
+      "../../third_party/valgrind/linux_x86/bin/valgrind-listener",
+      "../../third_party/valgrind/linux_x86/bin/valgrind-tsan.sh",
+      "../../third_party/valgrind/linux_x86/bin/vgdb",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/32bit-core-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/32bit-core-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/32bit-core.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/32bit-linux-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/32bit-linux-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/32bit-linux.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/32bit-sse-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/32bit-sse-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/32bit-sse.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/64bit-avx-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/64bit-avx-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/64bit-avx.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/64bit-core-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/64bit-core-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/64bit-core.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/64bit-linux-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/64bit-linux-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/64bit-linux.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/64bit-sse-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/64bit-sse-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/64bit-sse.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/amd64-avx-coresse-valgrind.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/amd64-avx-coresse.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/amd64-avx-linux-valgrind.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/amd64-avx-linux.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/amd64-coresse-valgrind.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/amd64-linux-valgrind.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/arm-core-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/arm-core-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/arm-core.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/arm-vfpv3-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/arm-vfpv3-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/arm-vfpv3.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/arm-with-vfpv3-valgrind.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/arm-with-vfpv3.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/default.supp",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/i386-coresse-valgrind.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/i386-linux-valgrind.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/memcheck-x86-linux",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/mips-cp0-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/mips-cp0-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/mips-cp0.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/mips-cpu-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/mips-cpu-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/mips-cpu.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/mips-fpu-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/mips-fpu-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/mips-fpu.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/mips-linux-valgrind.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/mips-linux.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/power-altivec-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/power-altivec-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/power-altivec.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/power-core-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/power-core-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/power-core.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/power-fpu-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/power-fpu-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/power-fpu.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/power-linux-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/power-linux-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/power-linux.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/power64-core-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/power64-core-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/power64-core.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/power64-linux-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/power64-linux-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/power64-linux.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/powerpc-altivec32l-valgrind.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/powerpc-altivec32l.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/powerpc-altivec64l-valgrind.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/powerpc-altivec64l.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/s390-acr-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/s390-acr-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/s390-acr.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/s390-fpr-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/s390-fpr-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/s390-fpr.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/s390x-core64-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/s390x-core64-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/s390x-core64.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/s390x-generic-valgrind.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/s390x-generic.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/s390x-linux64-valgrind-s1.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/s390x-linux64-valgrind-s2.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/s390x-linux64.xml",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/vgpreload_core-x86-linux.so",
+      "../../third_party/valgrind/linux_x86/lib/valgrind/vgpreload_memcheck-x86-linux.so",
     ]
   }
 }