Merge "Upgrade to valgrind 3.12.0." am: c9fc475448 am: 69d667e310
am: 267ca4b4aa

Change-Id: I4197148bbb038febb56b66b180d21975d246b511