Merge "Clean up obsolete libm makefile cruft."