Merge "SkBitmap::Config is deprecated, use SkColorType"