Merge "Revert of Pre-crop filled rects to avoid scissor (patchset #6 id:100001 of https://codereview.chromium.org/2132073002/ )" into master-skia

https://skia.googlesource.com/skia/+/aeadcdfbf203ccfedece9721d410192491815fc1

Change-Id: I6e47abdde414a9a2eb0f16aae776b69500add8a9