Merge "Clean up the architecture-specific makefiles."