Merge "ask skia to use flat gamma when rendering fonts from hwui"