Merge "Fix a few libc makefile mishaps."