Merge "Clean up the valgrind test targets."