Revert of Fix colorType/alphaType checks in SkCodec

src/codec/SkCodecPriv.h

 /*
  * Copyright 2015 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkCodecPriv_DEFINED
 #define SkCodecPriv_DEFINED
 
@@ skipping 118 matching lines @@
     // Ensure the alpha type is valid
     if (!valid_alpha(dst.alphaType(), src.alphaType())) {
         return false;
     }
 
     // Check for supported color types
     switch (dst.colorType()) {
         case kN32_SkColorType:
             return true;
         case kRGB_565_SkColorType:
-            return kOpaque_SkAlphaType == dst.alphaType();
-        case kGray_8_SkColorType:
-            if (kOpaque_SkAlphaType != dst.alphaType()) {
-                return false;
-            }
-            // Fall through
+            return src.alphaType() == kOpaque_SkAlphaType;
         default:
             return dst.colorType() == src.colorType();
     }
 }
 
 /*
  * If there is a color table, get a pointer to the colors, otherwise return nullptr
  */
 inline const SkPMColor* get_color_ptr(SkColorTable* colorTable) {
      return nullptr != colorTable ? colorTable->readColors() : nullptr;
@@ skipping 91 matching lines @@
     uint32_t result;
     memcpy(&result, &(buffer[i]), 4);
 #ifdef SK_CPU_BENDIAN
     return SkEndianSwap32(result);
 #else
     return result;
 #endif
 }
 
 #endif // SkCodecPriv_DEFINED