Revert of Remove uses of SkImageDecoder from gms

gm/astcbitmap.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 
 #include "Resources.h"
 #include "SkCanvas.h"
 #include "SkData.h"
-#include "SkImage.h"
 #include "SkImageGenerator.h"
+#include "SkImageDecoder.h"
 #include "SkOSFile.h"
 #include "SkTextureCompressor.h"
 
 static const char *kASTCFilenames[] = {
     "mandrill_128x128_4x4.astc",    // kASTC_4x4_Format
     "mandrill_130x128_5x4.astc",    // kASTC_5x4_Format
     "mandrill_130x130_5x5.astc",    // kASTC_5x5_Format
     "mandrill_132x130_6x5.astc",    // kASTC_6x5_Format
     "mandrill_132x132_6x6.astc",    // kASTC_6x6_Format
     "mandrill_128x130_8x5.astc",    // kASTC_8x5_Format
@@ skipping 39 matching lines @@
         for (int i = 0; i < 4; ++i) {
             SkAutoTUnref<SkImage> image(GetResourceAsImage(get_astc_filename(j*4+i)));
             if (image) {
                 const SkScalar bmX = static_cast<SkScalar>(i*kBitmapDimension);
                 const SkScalar bmY = static_cast<SkScalar>(j*kBitmapDimension);
                 canvas->drawImage(image, bmX, bmY);
             }
         }
     }
 }