Merge "Remove uses of SkTAddOffset and other private Skia functions"