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

* commit 'dc1c2820c777ecb97417b3dd4cd389169a48696c':
  Clean up some test makefiles.