Merge "replace SkColorSpaceXform with readPixels()"