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

Change-Id: Id6c95450397fb10c8e1f8eb831864c6aa035e290