Start trying to collapse path program stuff

src/gpu/gl/builders/GrGLProgramBuilder.h

Index: src/gpu/gl/builders/GrGLProgramBuilder.h
diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.h b/src/gpu/gl/builders/GrGLProgramBuilder.h
index 4eea150ae26209b7f1f130868a389df291520cb1..589a67968121419bf72cf94125bb89d638fe7f7c 100644
--- a/src/gpu/gl/builders/GrGLProgramBuilder.h
+++ b/src/gpu/gl/builders/GrGLProgramBuilder.h
@@ -13,7 +13,6 @@
 #include "GrGLVertexShaderBuilder.h"
 #include "../GrGLProgramDataManager.h"
 #include "../GrGLPathProgramDataManager.h"
-#include "../GrGLUniformHandle.h"
 #include "../GrGLPrimitiveProcessor.h"
 #include "../GrGLXferProcessor.h"
 #include "../../GrPipeline.h"
@@ -243,7 +242,7 @@ public:
                                   const char** outName) override;
 
     const GrGLShaderVar& getUniformVariable(UniformHandle u) const override {
-        return fUniforms[u.toShaderBuilderIndex()].fVariable;
+        return fUniforms[u.toIndex()].fVariable;
     }
 
     const char* getUniformCStr(UniformHandle u) const override {