am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."

* commit '52da99fac85d1e16a3c95bdd9c039801e920e6d1':
  Skia API changes as a result of an update to the Skia library.