Revert of Revert back to SkPictureData pictures.  Huge perf regression. (patchset #1 of https://codereview.chromium.org/496603002/)

Reason for revert:
Try again now that we have --bbh on nanobench and it's looking decent.

Original issue's description:
> Revert back to SkPictureData pictures.  Huge perf regression.
>
> http://skiaperf.com/#108
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/4082d290eea2f70caa82120ff3bc4fbdccbf206c

R=reed@google.com, mtklein@chromium.org
TBR=mtklein@chromium.org, reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/496173002
diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index d1a81a5..6239763 100644
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -447,12 +447,8 @@
         if (NULL == data) {
             return NULL;
         }
-#if 0
         const SkPicture src(data, info.fWidth, info.fHeight);
         return Forwardport(src);
-#else
-        return SkNEW_ARGS(SkPicture, (data, info.fWidth, info.fHeight));
-#endif
     }
 
     return NULL;
@@ -472,12 +468,8 @@
         if (NULL == data) {
             return NULL;
         }
-#if 0
         const SkPicture src(data, info.fWidth, info.fHeight);
         return Forwardport(src);
-#else
-        return SkNEW_ARGS(SkPicture, (data, info.fWidth, info.fHeight));
-#endif
     }
 
     return NULL;