Merge "Switch to Skia's new representation of linear gamma"