Merge "Manual revert of "Decode to sRGB in BitmapFactory""