am 951a3e5f: Merge "Build system tweaks for Valgrind."

* commit '951a3e5f416d9ebe84e922132c85c8696d5d74a0':
  Build system tweaks for Valgrind.