am 8c1c7cfa: Cherrypick change to skia

* commit '8c1c7cfacd82a174c65fcbf839d7037e3692aee8':
  Cherrypick change to skia