Revert "fill rect batch refactor into separate batches"

This reverts commit ae41b3834301444cf27b8aa729b8ad36666bdc08.

TBR=bsalomon@google.com
BUG=skia:

Review URL: https://codereview.chromium.org/1301203002
3 files changed