Merge "Revert "Update to FreeBSD libm r336523.""