Merge "Support Skia's gray SkColorSpaces" into rvc-dev