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:
whoops, accidental commit

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

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

Committed: https://skia.googlesource.com/skia/+/67f7f74fb2296b1f218025dfd57fb462c29fbbfa

[joshualitt, 2014-10-22 22:51:27]

Created Revert of Oval and stroke AA rect now batch

[commit-bot: I haz the power, 2014-10-22 22:51:41]

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

[commit-bot: I haz the power, 2014-10-22 22:51:56]

Committed patchset #1 (id:1) as 67f7f74fb2296b1f218025dfd57fb462c29fbbfa