Flush some non-substantive Ganesh changes

src/gpu/batches/GrDiscardBatch.h

Index: src/gpu/batches/GrDiscardBatch.h
diff --git a/src/gpu/batches/GrDiscardBatch.h b/src/gpu/batches/GrDiscardBatch.h
index 5dafe54f1189114920d5e76b4bfa2672b1692af3..92406bb14862bcd5e03cc74cb3d4da0ea274dd94 100644
--- a/src/gpu/batches/GrDiscardBatch.h
+++ b/src/gpu/batches/GrDiscardBatch.h
@@ -38,7 +38,7 @@ public:
 
 private:
     bool onCombineIfPossible(GrBatch* that, const GrCaps& caps) override {
-        return fRenderTarget == that->cast<GrDiscardBatch>()->fRenderTarget;
+        return this->renderTargetUniqueID() == that->renderTargetUniqueID();
     }
 
     void onPrepare(GrBatchFlushState*) override {}