Merge "Clean up the valgrind test targets."
am: de83659474

* commit 'de836594741c8547afb2a680e1d442dcc27cfbe5':
  Clean up the valgrind test targets.