Merge "Replacing FloatMath native implementation with calls to Math"