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

Change-Id: I40cabf407fb6c589ebeb1d524861d93e452bf8fe