Merge "Fix dependencies on x86_64 valgrind"
am: a5b02382ba

Change-Id: Icd72261f0796c06cf853d64b86a07539a738735e