Merge "Deprecate color array drawBitmap methods"