Merge "update callers to newer Skia APIs"