Revert of Refactor how we store and use samplers in Ganesh

src/gpu/gl/builders/GrGLProgramBuilder.cpp

Index: src/gpu/gl/builders/GrGLProgramBuilder.cpp
diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp
index c6422caa86f1410adca213440d8be6cc4b134be1..fbe1722ded9b535f5d7de6255908e3e2ac0587b5 100644
--- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp
+++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp
@@ -233,9 +233,9 @@
                            fUniformHandles,
                            programID,
                            fUniformHandler.fUniforms,
-                           fUniformHandler.fSamplers,
                            fVaryingHandler.fPathProcVaryingInfos,
                            fGeometryProcessor,
                            fXferProcessor,
-                           fFragmentProcessors);
-}
+                           fFragmentProcessors,
+                           &fSamplerUniforms);
+}