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

* commit '5fc8f683e6345353d418cb32f4f8335964e1613b':
  Clean up some test makefiles.