am 9b1d0758: Merge "Cherrypick change to skia"

* commit '9b1d07582a57f0bf58a60f0b8e8f81a5d1c6b867':
  Cherrypick change to skia