Merge "Don't depend on x86 valgrind"