am f6f43bd2: merge from open-source master

Merge commit 'f6f43bd241efd58483c1daf75100a21822aea0e4' into kraken

* commit 'f6f43bd241efd58483c1daf75100a21822aea0e4':
  Use SkScalarMulDiv where appropriate