Merge "Revert "Switch libm to building with clang.""