Upgrade GPUOptimize

include/core/SkPicture.h

Index: include/core/SkPicture.h
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index a83490dcbf07b826cc99cc1cec9225cf5f382038..d353a2a91c340f53ab44402cd1a7c127addb425f 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -33,6 +33,10 @@ struct SkPictInfo;
 
 class SkRecord;
 
+namespace SkRecords {
+    class CollectLayers;
+};
+
 /** \class SkPicture
 
     The SkPicture class records the drawing commands made to a canvas, to
@@ -276,7 +280,7 @@ private:
     friend class SkPictureRecorder;            // SkRecord-based constructor.
     friend class SkGpuDevice;                  // for fData access
     friend class GrLayerHoister;               // access to fRecord
-    friend class CollectLayers;                // access to fRecord
+    friend class SkRecords::CollectLayers;     // access to fRecord
     friend class SkPicturePlayback;            // to get fData
     friend class ReplaceDraw;