Merge "pass Paint not SkPaint to Canvas"