Change computeOutputColorType() to mimic old behavior

src/codec/SkAndroidCodec.cpp

Index: src/codec/SkAndroidCodec.cpp
diff --git a/src/codec/SkAndroidCodec.cpp b/src/codec/SkAndroidCodec.cpp
index 491daf5e681b6e10167ad7d45144eaebfc371a07..287d54f209ba9e0b67b7ae44473328a202c23757 100644
--- a/src/codec/SkAndroidCodec.cpp
+++ b/src/codec/SkAndroidCodec.cpp
@@ -79,6 +79,13 @@ SkColorType SkAndroidCodec::computeOutputColorType(SkColorType requestedColorTyp
             break;
     }
 
+    // Android has limited support for kGray_8 (using kAlpha_8).  We will not
+    // use kGray_8 for Android unless they specifically ask for it.
+    if (kGray_8_SkColorType == suggestedColorType) {

[msarett, 2015/12/11 16:41:13]

As you stated in another review, we need this to match SkImageDecoder_libpng.

+        return kN32_SkColorType;
+    }
+
+    // This may be kN32_SkColorType or kIndex_8_SkColorType.
     return suggestedColorType;
 }