Merge "Fix dependencies on x86_64 valgrind"