Merge "Revert "Replacing FloatMath native implementation with calls to Math""