Revert of Clip mask manager sets stencil on draw type

src/gpu/GrClipMaskManager.h

Index: src/gpu/GrClipMaskManager.h
diff --git a/src/gpu/GrClipMaskManager.h b/src/gpu/GrClipMaskManager.h
index 8a4b45a82e2d016445123b05f174ef1c058f75e9..c98648b1287725116c859ce263f58b7668ca653b 100644
--- a/src/gpu/GrClipMaskManager.h
+++ b/src/gpu/GrClipMaskManager.h
@@ -50,9 +50,7 @@
      * the manager when it must install additional effects to implement the
      * clip. devBounds is optional but can help optimize clipping.
      */
-    bool setupClipping(const GrClipData* clipDataIn,
-                       GrDrawState::AutoRestoreEffects*,
-                       GrDrawState::AutoRestoreStencil*,
+    bool setupClipping(const GrClipData* clipDataIn, GrDrawState::AutoRestoreEffects*,
                        const SkRect* devBounds);
 
     /**
@@ -175,7 +173,7 @@
      * updates the GrGpu with stencil settings that account stencil-based
      * clipping.
      */
-    void setDrawStateStencil(GrDrawState::AutoRestoreStencil* asr);
+    void setGpuStencil();
 
     /**
      * Adjusts the stencil settings to account for interaction with stencil