Merge "Runtest support for tests that need 'make' not 'mmm' to build."