Merge "Fix dependencies on x86_64 valgrind" am: a5b02382ba am: 369a4ceed7
am: 5460400989

Change-Id: I80a997d5aaa408aa097636ace8073e4aeea5e256