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

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