Merge "don't reference (deprecated) kIgnore_SkAlphaType"