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

* commit '4f66469b29a34811b69518a266be31fe42cc111b':
  More test makefile cleanup.