Merge "Fix Skia merge by fixing API mismatch."