Revert of Allow LCD text to batch across colorchanges. This will always use

src/gpu/effects/GrBitmapTextGeoProc.cpp

Index: src/gpu/effects/GrBitmapTextGeoProc.cpp
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp
index 6fd353849e18c9d2822cdaa6c846eb75520b8cfb..a8643b03f992a8dba536fb4cff6c6b558bba48c0 100644
--- a/src/gpu/effects/GrBitmapTextGeoProc.cpp
+++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp
@@ -144,8 +144,9 @@
     this->initClassID<GrBitmapTextGeoProc>();
     fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType));
 
-    bool hasVertexColor = kA8_GrMaskFormat == fMaskFormat ||
-                          kA565_GrMaskFormat == fMaskFormat;
+    // TODO we could think about removing this attribute if color is ignored, but unfortunately
+    // we don't do text positioning in batch, so we can't quite do that yet.
+    bool hasVertexColor = kA8_GrMaskFormat == fMaskFormat;
     if (hasVertexColor) {
         fInColor = &this->addVertexAttrib(Attribute("inColor", kVec4ub_GrVertexAttribType));
     }