am 6bf7c5cf: Merge "Clean up test makefiles."

* commit '6bf7c5cfc981ce4ecbd671d73a9eab8398dc8dd4':
  Clean up test makefiles.