Merge "Replace direct SkSurface creation with canvas->makeSurface"