am 5b7f5b15: am 4f66469b: Merge "More test makefile cleanup."

* commit '5b7f5b15af016299e10d18979ec65720ab447786':
  More test makefile cleanup.