Separate user and raw stencil settings

gyp/gpu.gypi

Index: gyp/gpu.gypi
diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi
index 48f1c8526d0dd68c8f14d3963cee6bd2522e0b01..dc16c2cab2df6b49d52c1babeaf987f6f9188bc9 100644
--- a/gyp/gpu.gypi
+++ b/gyp/gpu.gypi
@@ -170,10 +170,10 @@
       '<(skia_src_path)/gpu/GrResourceProvider.h',
       '<(skia_src_path)/gpu/GrShape.cpp',
       '<(skia_src_path)/gpu/GrShape.h',
-      '<(skia_src_path)/gpu/GrStencil.cpp',
-      '<(skia_src_path)/gpu/GrStencil.h',
       '<(skia_src_path)/gpu/GrStencilAttachment.cpp',
       '<(skia_src_path)/gpu/GrStencilAttachment.h',
+      '<(skia_src_path)/gpu/GrStencilSettings.cpp',
+      '<(skia_src_path)/gpu/GrStencilSettings.h',
       '<(skia_src_path)/gpu/GrStyle.cpp',
       '<(skia_src_path)/gpu/GrStyle.h',
       '<(skia_src_path)/gpu/GrTessellator.cpp',
@@ -200,6 +200,7 @@
       '<(skia_src_path)/gpu/GrTextureToYUVPlanes.h',
       '<(skia_src_path)/gpu/GrTextureAccess.cpp',
       '<(skia_src_path)/gpu/GrTRecorder.h',
+      '<(skia_src_path)/gpu/GrUserStencilSettings.h',
       '<(skia_src_path)/gpu/GrXferProcessor.cpp',
       '<(skia_src_path)/gpu/GrYUVProvider.cpp',
       '<(skia_src_path)/gpu/GrYUVProvider.h',