Merge "Remove SkFloatToScalar."