[upstream] Valgrind-3.10.0: tweaks.