Merge "Decode to sRGB in BitmapFactory"

    SkAlphaType alphaType = codec->computeOutputAlphaType(requireUnpremultiplied);

    const SkImageInfo decodeInfo = SkImageInfo::Make(size.width(), size.height(),

            decodeColorType, alphaType, GraphicsJNI::defaultColorSpace());

            decodeColorType, alphaType, codec->computeOutputColorSpace(decodeColorType));

    SkImageInfo bitmapInfo = decodeInfo;

    // We always decode to sRGB, but only mark the bitmap with a color space if linear

    // blending is enabled.

    SkImageInfo bitmapInfo = decodeInfo.makeColorSpace(GraphicsJNI::defaultColorSpace());

    if (decodeColorType == kGray_8_SkColorType) {

        // The legacy implementation of BitmapFactory used kAlpha8 for

        // grayscale images (before kGray8 existed).  While the codec