Revert of Enabling ico decoding with use of png and bmp decoders

include/codec/SkCodec.h

Index: include/codec/SkCodec.h
diff --git a/include/codec/SkCodec.h b/include/codec/SkCodec.h
index c3840354f158adc59b8e06c545c7b10407d39596..ec4b3e1cc80832090c1389823b7e206ab6e97783 100644
--- a/include/codec/SkCodec.h
+++ b/include/codec/SkCodec.h
@@ -71,6 +71,9 @@
     }
 #endif
 
+    // Helper for subclasses.
+    const SkImageInfo& getOriginalInfo() { return fInfo; }
+
     virtual SkISize onGetScaledDimensions(float /* desiredScale */) const {
         // By default, scaling is not supported.
         return fInfo.dimensions();