Merge "Fix libm build for x86_64."