Revert of Delete SkImageDecoder

src/core/SkLayerInfo.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkLayerInfo_DEFINED
 #define SkLayerInfo_DEFINED
 
 #include "SkBigPicture.h"
-#include "SkMatrix.h"
-#include "SkPaint.h"
 #include "SkTArray.h"
 
 // This class stores information about the saveLayer/restore pairs found
 // within an SkPicture. It is used by Ganesh to perform layer hoisting.
 class SkLayerInfo : public SkBigPicture::AccelData {
 public:
     // Information about a given saveLayer/restore block in an SkPicture
     class BlockInfo {
     public:
         BlockInfo() : fPicture(nullptr), fPaint(nullptr), fKey(nullptr), fKeySize(0) {}
@@ skipping 54 matching lines @@
         return fBlocks[index];
     }
 
 private:
     SkTArray<BlockInfo, true> fBlocks;
 
     typedef SkBigPicture::AccelData INHERITED;
 };
 
 #endif // SkLayerInfo_DEFINED