Merge "Upgrade to valgrind 3.13.0 (15 June 2017)." am: 84dd75ab14
am: b2c798d6de

Change-Id: I5d4640b762722fd7f2e3c31f5b16aa64b1447743