Revert of Make SkAndroidCodec support ico

src/codec/SkBmpStandardCodec.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBmpCodec.h"
 #include "SkColorTable.h"
 #include "SkImageInfo.h"
@@ skipping 57 matching lines @@
      * Creates the color table
      * Sets colorCount to the new color count if it is non-nullptr
      */
     bool createColorTable(SkAlphaType alphaType, int* colorCount);
 
     bool initializeSwizzler(const SkImageInfo& dstInfo, const Options& opts);
 
     int decodeRows(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes,
             const Options& opts) override;
 
-    /*
-     * @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);
+    Result decodeIcoMask(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes);
 
     SkAutoTUnref<SkColorTable>          fColorTable;     // owned
     const uint32_t                      fNumColors;
     const uint32_t                      fBytesPerColor;
     const uint32_t                      fOffset;
     SkAutoTDelete<SkSwizzler>           fSwizzler;
     const size_t                        fSrcRowBytes;
     SkAutoTDeleteArray<uint8_t>         fSrcBuffer;
     const bool                          fInIco;
-    const size_t                        fAndMaskRowBytes; // only used for fInIco decodes
 
     typedef SkBmpCodec INHERITED;
 };