Merge "Convert blitter over to new style from_srgb, to_srgb." into master-skia

https://skia.googlesource.com/skia/+/e03339a35435b6c4b9ddb5b9d1d3592be5185de2

Change-Id: I2fc424e4682f0ea400c10f440264baa98242a120