Change where layer hoisting data is gathered

src/core/SkMultiPictureDraw.cpp

Index: src/core/SkMultiPictureDraw.cpp
diff --git a/src/core/SkMultiPictureDraw.cpp b/src/core/SkMultiPictureDraw.cpp
index 0e21b5c54aa85f15d510aaead644ef812941c938..02855984138a6a5d2f3949e31c14c91570e5206d 100644
--- a/src/core/SkMultiPictureDraw.cpp
+++ b/src/core/SkMultiPictureDraw.cpp
@@ -112,10 +112,6 @@ void SkMultiPictureDraw::draw() {
         SkASSERT(data.fCanvas->getGrContext() == context);
 
         if (!data.fPaint && data.fMatrix.isIdentity()) {
-            // TODO: this path always tries to optimize pictures. Should we
-            // switch to this API approach (vs. SkCanvas::EXPERIMENTAL_optimize)?
-            data.fCanvas->EXPERIMENTAL_optimize(data.fPicture);
-
             SkRect clipBounds;
             if (!data.fCanvas->getClipBounds(&clipBounds)) {
                 continue;