am 7a92d20e: Merge "Clean up some test makefiles."

* commit '7a92d20ec845c07472eaea7cf14fd0e69df836ef':
  Clean up some test makefiles.