Merge "Fix issue with SkPaint references being out of date."