Revert of Initial version of external_oes texture support and unit test

include/gpu/GrTypesPriv.h

Index: include/gpu/GrTypesPriv.h
diff --git a/include/gpu/GrTypesPriv.h b/include/gpu/GrTypesPriv.h
index 6135c14c12198232b67e41dbc7ea63545a278634..9202742df9344b0b1245d9a2c56e26f23056b0ab 100644
--- a/include/gpu/GrTypesPriv.h
+++ b/include/gpu/GrTypesPriv.h
@@ -25,9 +25,8 @@
     kMat33f_GrSLType,
     kMat44f_GrSLType,
     kSampler2D_GrSLType,
-    kSamplerExternal_GrSLType,
-
-    kLast_GrSLType = kSamplerExternal_GrSLType
+
+    kLast_GrSLType = kSampler2D_GrSLType
 };
 static const int kGrSLTypeCount = kLast_GrSLType + 1;
 
@@ -64,7 +63,7 @@
  */
 static inline int GrSLTypeVectorCount(GrSLType type) {
     SkASSERT(type >= 0 && type < static_cast<GrSLType>(kGrSLTypeCount));
-    static const int kCounts[] = { -1, 1, 2, 3, 4, -1, -1, -1, -1 };
+    static const int kCounts[] = { -1, 1, 2, 3, 4, -1, -1, -1 };
     return kCounts[type];
 
     GR_STATIC_ASSERT(0 == kVoid_GrSLType);
@@ -75,7 +74,6 @@
     GR_STATIC_ASSERT(5 == kMat33f_GrSLType);
     GR_STATIC_ASSERT(6 == kMat44f_GrSLType);
     GR_STATIC_ASSERT(7 == kSampler2D_GrSLType);
-    GR_STATIC_ASSERT(8 == kSamplerExternal_GrSLType);
     GR_STATIC_ASSERT(SK_ARRAY_COUNT(kCounts) == kGrSLTypeCount);
 }
 
@@ -104,8 +102,7 @@
     GR_STATIC_ASSERT(5 == kMat33f_GrSLType);
     GR_STATIC_ASSERT(6 == kMat44f_GrSLType);
     GR_STATIC_ASSERT(7 == kSampler2D_GrSLType);
-    GR_STATIC_ASSERT(8 == kSamplerExternal_GrSLType);
-    GR_STATIC_ASSERT(9 == kGrSLTypeCount);
+    GR_STATIC_ASSERT(8 == kGrSLTypeCount);
 }
 //////////////////////////////////////////////////////////////////////////////