Reland of Better encapsulate oval/rrect batchs. (patchset #1 id:1 of https://coderevi...

Reland of Better encapsulate oval/rrect batchs. (patchset #1 id:1 of https://codereview.chromium.org/2121313004/ )

Reason for revert:
Workaround for compiler/stdlib bug landed: https://codereview.chromium.org/2135453002

Original issue's description:
> 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

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

Review-Url: https://codereview.chromium.org/2134693002