Merge "Fix use of Skia deprecated methods"