Merge "Remove dependence on SkTRegistry"