Temporary fix to remove drawrect call from GpuGL

BUG=skia:

Review URL: https://codereview.chromium.org/694933002
rebaseline
TBR=

BUG=skia:

Review URL: https://codereview.chromium.org/696853002
Revert of Temporary fix to remove drawrect call from GpuGL (patchset #6 id:90005 of https://codereview.chromium.org/694933002/)

Reason for revert:
patch breaks angle bots and K1

Original issue's description:
> Temporary fix to remove drawrect call from GpuGL
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/d4a5c2028117c100ccf44263c0118a0b4745f627

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

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