Merge "Use SkCanvasAndroid functions instead of deprecated canvasMethods"