am 2d7d3f78: (-s ours) am f247e545: Merge "Adapt to latest skia"

* commit '2d7d3f78c90734c8067ab76b8f5daca84a311c92':
  Adapt to latest skia