Revert of Avoid too small reads to bufferMoreData() (patchset #4 id:60001 of https...

Revert of Avoid too small reads to bufferMoreData() (patchset #4 id:60001 of https://codereview.chromium.org/1644893003/ )

Reason for revert:
Crashed both Nexus 5s:

  https://build.chromium.org/p/client.skia.android/builders/Perf-Android-GCC-Nexus5-CPU-NEON-Arm7-Release/builds/3355
https://build.chromium.org/p/client.skia.android/builders/Perf-Android-GCC-Nexus5-CPU-NEON-Arm7-Release/builds/3354

Original issue's description:
> Avoid too small reads to bufferMoreData()
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1644893003
>
> Committed: https://skia.googlesource.com/skia/+/fd918e8c739065fa467cf6614181d3a2c5dcadcb

TBR=msarett@google.com,scroggo@google.com,yujieqin@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/1656303002