Add the lazy decoder from PictureFlags to SkImageDecoder

tools/pinspect.cpp

Index: tools/pinspect.cpp
diff --git a/tools/pinspect.cpp b/tools/pinspect.cpp
index 969d87c4fed94c7e49b79a3c6c0e89368faf34a6..7f281834e13f03d01794849a92c8a30ad2fe34de 100644
--- a/tools/pinspect.cpp
+++ b/tools/pinspect.cpp
@@ -14,12 +14,6 @@
 #include "SkStream.h"
 #include "SkString.h"
 #include "SkDumpCanvas.h"
-#include "SkForceLinking.h"
-
-__SK_FORCE_IMAGE_DECODER_LINKING;
-
-// Defined in PictureRenderingFlags.cpp
-extern bool lazy_decode_bitmap(const void* buffer, size_t size, SkBitmap* bitmap);
 
 static SkPicture* inspect(const char path[]) {
     SkFILEStream stream(path);
@@ -40,7 +34,7 @@ static SkPicture* inspect(const char path[]) {
     }
 
     stream.rewind();
-    SkPicture* pic = SkPicture::CreateFromStream(&stream, &lazy_decode_bitmap);
+    SkPicture* pic = SkPicture::CreateFromStream(&stream, &SkImageDecoder::LazyDecodeBitmap);
     if (NULL == pic) {
         SkDebugf("Could not create SkPicture: %s\n", path);
         return NULL;