Revert of Cleanup of shader building system

src/gpu/gl/builders/GrGLGeometryShaderBuilder.h

Index: src/gpu/gl/builders/GrGLGeometryShaderBuilder.h
diff --git a/src/gpu/gl/builders/GrGLGeometryShaderBuilder.h b/src/gpu/gl/builders/GrGLGeometryShaderBuilder.h
index aa27f23f03f6d402900cf30736a8f171dc4771fc..833d31774f82f7f0a69d0921a4a98b95d9181b66 100644
--- a/src/gpu/gl/builders/GrGLGeometryShaderBuilder.h
+++ b/src/gpu/gl/builders/GrGLGeometryShaderBuilder.h
@@ -10,9 +10,12 @@
 
 #include "GrGLShaderBuilder.h"
 
-class GrGLGeometryBuilder : public GrGLShaderBuilder {
+class GrGLProgramBuilder;
+
+class GrGLGeometryShaderBuilder : public GrGLFullShaderBuilder {
 public:
-    GrGLGeometryBuilder(GrGLProgramBuilder* program);
+    GrGLGeometryShaderBuilder(GrGLFullProgramBuilder* program);
+private:
     /*
      * an internal call for GrGLFullProgramBuilder to add varyings
      */
@@ -22,7 +25,8 @@
 
     bool compileAndAttachShaders(GrGLuint programId, SkTDArray<GrGLuint>* shaderIds) const;
 
-    typedef GrGLShaderBuilder INHERITED;
+    friend class GrGLFullProgramBuilder;
+    typedef GrGLFullShaderBuilder INHERITED;
 };
 
 #endif