Merge "Work around incorrect Skia gamma" into pi-dev
am: c45c2d65a5

Change-Id: Id3e644dfa906600d664454cc96af242cf7bf2ff0