Make SkAndroidCodec support ico

src/codec/SkBmpStandardCodec.h

Index: src/codec/SkBmpStandardCodec.h
diff --git a/src/codec/SkBmpStandardCodec.h b/src/codec/SkBmpStandardCodec.h
index d687eaad287a8c602219905c3810a9e3154f922a..7f23616a60b730c85f7cfde3df1a73e7ad67f956 100644
--- a/src/codec/SkBmpStandardCodec.h
+++ b/src/codec/SkBmpStandardCodec.h
@@ -75,7 +75,12 @@ private:
     int decodeRows(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes,
             const Options& opts) override;
 
-    Result decodeIcoMask(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes);
+    /*
+     * @param stream This may be a pointer to the stream owned by the parent SkCodec
+     *               or a sub-stream of the stream owned by the parent SkCodec.
+     *               Either way, this stream is unowned.
+     */
+    void decodeIcoMask(SkStream* stream, const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes);
 
     SkAutoTUnref<SkColorTable>          fColorTable;     // owned
     const uint32_t                      fNumColors;
@@ -85,6 +90,7 @@ private:
     const size_t                        fSrcRowBytes;
     SkAutoTDeleteArray<uint8_t>         fSrcBuffer;
     const bool                          fInIco;
+    const size_t                        fAndMaskRowBytes; // only used for fInIco decodes
 
     typedef SkBmpCodec INHERITED;
 };