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

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