Merge "reset mShapingPaint's SkTypeface before we use it" into klp-dev