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

* commit 'fe80b7ee58b394b0cd958470aeea3c5a09f6b2bf':
  Clean up test makefiles.