am 0745fbfa: am c7249660: am 4f66469b: Merge "More test makefile cleanup."

* commit '0745fbfad9cadafc0f911ec7c6d06d470839b85a':