Revert of drawBitmapImage can batch across AA rects

src/gpu/batches/GrRectBatchFactory.h

Index: src/gpu/batches/GrRectBatchFactory.h
diff --git a/src/gpu/batches/GrRectBatchFactory.h b/src/gpu/batches/GrRectBatchFactory.h
index 5a43a342143eb3a7fe223f2ffccebf8e6aa1ca33..7eaec795e8a827da644aa4c6139ea0c3aa063e4d 100644
--- a/src/gpu/batches/GrRectBatchFactory.h
+++ b/src/gpu/batches/GrRectBatchFactory.h
@@ -23,10 +23,10 @@
 namespace GrRectBatchFactory {
 
 inline GrDrawBatch* CreateFillBW(GrColor color,
-                                 const SkMatrix& viewMatrix,
-                                 const SkRect& rect,
-                                 const SkRect* localRect,
-                                 const SkMatrix* localMatrix) {
+                             const SkMatrix& viewMatrix,
+                             const SkRect& rect,
+                             const SkRect* localRect,
+                             const SkMatrix* localMatrix) {
     return GrBWFillRectBatch::Create(color, viewMatrix, rect, localRect, localMatrix);
 }
 
@@ -35,14 +35,6 @@
                                  const SkRect& rect,
                                  const SkRect& devRect) {
     return GrAAFillRectBatch::Create(color, viewMatrix, rect, devRect);
-}
-
-inline GrDrawBatch* CreateFillAA(GrColor color,
-                                 const SkMatrix& viewMatrix,
-                                 const SkMatrix& localMatrix,
-                                 const SkRect& rect,
-                                 const SkRect& devRect) {
-    return GrAAFillRectBatch::Create(color, viewMatrix, localMatrix, rect, devRect);
 }
 
 GrDrawBatch* CreateStrokeBW(GrColor color,