Revert of Separate user and raw stencil settings

src/gpu/GrPipeline.h

Index: src/gpu/GrPipeline.h
diff --git a/src/gpu/GrPipeline.h b/src/gpu/GrPipeline.h
index ff1905b462e05b5c152041eaed00bf326bb0fae2..f64b875f133d2cab9c3ffb21691074863dd4cbe9 100644
--- a/src/gpu/GrPipeline.h
+++ b/src/gpu/GrPipeline.h
@@ -15,7 +15,7 @@
 #include "GrPendingProgramElement.h"
 #include "GrPrimitiveProcessor.h"
 #include "GrProgramDesc.h"
-#include "GrStencilSettings.h"
+#include "GrStencil.h"
 #include "GrTypesPriv.h"
 #include "SkMatrix.h"
 #include "SkRefCnt.h"
@@ -51,8 +51,6 @@
         const GrCaps*               fCaps;
         GrPipelineOptimizations     fOpts;
         const GrScissorState*       fScissor;
-        int                         fNumStencilBits;
-        bool                        fHasStencilClip;
         GrXferProcessor::DstTexture fDstTexture;
     };