am bcaaebb8: Merge "Clean up test makefiles."

* commit 'bcaaebb8a881951720190f4a6b9ffcbf871542af':
  Clean up test makefiles.