Merge "stop using (deprecated) SkBitmap::Config"