Merge "kNative_8888_SkColorType is now kN32_SkColorType"