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

Change-Id: I8e70a674fd222070b1782f40b74e5a36b7b141a4