Merge "Upload bitmaps in SkShader* safely" into mnc-dev