Revert of nanobench: lazily decode bitmaps from SKPs

bench/nanobench.cpp

Index: bench/nanobench.cpp
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index eff0b2f782a9c6e5e09fb6297ced07b7eb05c724..67646c266770adccafd78800b98850dd8f19ff97 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -10,7 +10,6 @@
 #include "Benchmark.h"
 #include "CrashHandler.h"
 #include "GMBench.h"
-#include "LazyDecodeBitmap.h"
 #include "ProcStats.h"
 #include "ResultsWriter.h"
 #include "RecordingBench.h"
@@ -451,7 +450,7 @@
             return false;
         }
 
-        pic->reset(SkPicture::CreateFromStream(stream.get(), sk_tools::LazyDecodeBitmap));
+        pic->reset(SkPicture::CreateFromStream(stream.get()));
         if (pic->get() == NULL) {
             SkDebugf("Could not read %s as an SkPicture.\n", path);
             return false;