Merge "Makefile cleanups."