am 0d5a719d: am b088c9e0: Merge "reset mShapingPaint\'s SkTypeface before we use it" into klp-dev

* commit '0d5a719dc7f2ca8726f670af3c5b9fdee614ab07':
  reset mShapingPaint's SkTypeface before we use it