Merge "Adapt to latest skia"