Fix ICO bug exposed by the fuzzer

src/codec/SkBmpCodec.cpp

Index: src/codec/SkBmpCodec.cpp
diff --git a/src/codec/SkBmpCodec.cpp b/src/codec/SkBmpCodec.cpp
index 680436ab91499a07b0451d6254150282fcc8a712..1c999eba3c1ce438caaf5fb1e7f3b86d0c225d42 100644
--- a/src/codec/SkBmpCodec.cpp
+++ b/src/codec/SkBmpCodec.cpp
@@ -442,7 +442,9 @@ bool SkBmpCodec::ReadHeader(SkStream* stream, bool inIco, SkCodec** codecOut) {
                     }
                     break;
                 case 24:
-                    color = SkEncodedInfo::kBGR_Color;
+                    // In the case of ICO, kBGRA is actually the closest match,
+                    // since we will need to apply a transparency mask.
+                    color = inIco ? SkEncodedInfo::kBGRA_Color : SkEncodedInfo::kBGR_Color;
                     bitsPerComponent = 8;
                     break;
                 case 32: