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

* commit 'c7249660f908c74687b5fdadc1296eb9d4903cc7':