Merge "Clean up some makefiles."