Revert of Better encapsulate oval/rrect batchs.

Revert of Better encapsulate oval/rrect batchs. (patchset #5 id:80001 of https://codereview.chromium.org/2104423003/ )

Reason for revert:
This CL is suspected to break compilation on arm64.
https://build.chromium.org/p/chromium.android/builders/Android%20arm64%20Builder%20%28dbg%29/builds/5851/steps/compile/logs/stdio

Original issue's description:
> Better encapsulate oval/rrect batchs.
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2104423003
> 
> Committed: https://skia.googlesource.com/skia/+/5fd209e8ee477c703bc5c11b008f247d515fc0fc
> Committed: https://skia.googlesource.com/skia/+/7f06c6947a3bef78dc57b9252779567c33604c90
> Committed: https://skia.googlesource.com/skia/+/11bf8b2eae7d1780cb969146422a2ab3b933047a

TBR=robertphillips@google.com,bsalomon@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Committed: https://skia.googlesource.com/skia/+/c79fc33d3e83664ffbd3651df3131c3e9e0b635c

[hush (inactive), 2016-07-07 20:51:56]

The CQ bit was checked by hush@chromium.org

[hush (inactive), 2016-07-07 20:51:56]

Created Revert of Better encapsulate oval/rrect batchs.

[commit-bot: I haz the power, 2016-07-07 20:52:04]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-07 20:52:06]

Note for Reviewers:
The CQ is waiting for an approval.
If you believe that the CL is not ready yet, or if you would like to L-G-T-M
with comments then please uncheck the CQ checkbox.

Waiting for LGTM from valid reviewer(s) till 2016-07-08 02:52 UTC

[bsalomon, 2016-07-07 20:56:43]

lgtm

[commit-bot: I haz the power, 2016-07-07 20:58:41]

Description was changed from

==========
Revert of Better encapsulate oval/rrect batchs. (patchset #5 id:80001 of
https://codereview.chromium.org/2104423003/ )

Reason for revert:
This CL is suspected to break compilation on arm64.
https://build.chromium.org/p/chromium.android/builders/Android%20arm64%20Buil...

Original issue's description:
> Better encapsulate oval/rrect batchs.
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2104423003
> 
> Committed:
https://skia.googlesource.com/skia/+/5fd209e8ee477c703bc5c11b008f247d515fc0fc
> Committed:
https://skia.googlesource.com/skia/+/7f06c6947a3bef78dc57b9252779567c33604c90
> Committed:
https://skia.googlesource.com/skia/+/11bf8b2eae7d1780cb969146422a2ab3b933047a

TBR=robertphillips@google.com,bsalomon@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
==========

to

==========
Revert of Better encapsulate oval/rrect batchs. (patchset #5 id:80001 of
https://codereview.chromium.org/2104423003/ )

Reason for revert:
This CL is suspected to break compilation on arm64.
https://build.chromium.org/p/chromium.android/builders/Android%20arm64%20Buil...

Original issue's description:
> Better encapsulate oval/rrect batchs.
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2104423003
> 
> Committed:
https://skia.googlesource.com/skia/+/5fd209e8ee477c703bc5c11b008f247d515fc0fc
> Committed:
https://skia.googlesource.com/skia/+/7f06c6947a3bef78dc57b9252779567c33604c90
> Committed:
https://skia.googlesource.com/skia/+/11bf8b2eae7d1780cb969146422a2ab3b933047a

TBR=robertphillips@google.com,bsalomon@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Committed:
https://skia.googlesource.com/skia/+/c79fc33d3e83664ffbd3651df3131c3e9e0b635c
==========

[commit-bot: I haz the power, 2016-07-07 20:58:42]

Committed patchset #1 (id:1) as
https://skia.googlesource.com/skia/+/c79fc33d3e83664ffbd3651df3131c3e9e0b635c

[bsalomon, 2016-07-08 11:42:32]

A revert of this CL (patchset #1 id:1) has been created in
https://codereview.chromium.org/2134693002/ by bsalomon@google.com.

The reason for reverting is: Workaround for compiler/stdlib bug landed:
https://codereview.chromium.org/2135453002.