Revert of Oval and stroke AA rect now batch

Revert of Oval and stroke AA rect now batch (patchset #7 id:110001 of https://codereview.chromium.org/664193002/)

Reason for revert:
Many GMs failing, e.g. http://build.chromium.org/p/client.skia.android/builders/Test-Android-Nexus5-Adreno330-Arm7-Release/builds/95/steps/Compare%20GMs/logs/stdio

Original issue's description:
> Oval and stroke AA rect now batch
> 
> BUG=skia:
> 
> Committed: https://skia.googlesource.com/skia/+/bc54fab1a4e5b51628a8c1557c62bc74e078870d

TBR=robertphillips@google.com,joshualitt@google.com,bsalomon@google.com,joshualitt@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Committed: https://skia.googlesource.com/skia/+/9deb696f58e840783e7026ae2ce3495effee299d

[mtklein, 2014-10-22 22:22:26]

Created Revert of Oval and stroke AA rect now batch

[commit-bot: I haz the power, 2014-10-22 22:23:16]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/671993003/1

[commit-bot: I haz the power, 2014-10-22 22:23:33]

Committed patchset #1 (id:1) as 9deb696f58e840783e7026ae2ce3495effee299d