Merge "Clean up some test makefiles."