Merge "Use SkSurface::recordingContext instead of deprecated getContext"