Roll Skia from 22cc3be64b3e to b7f5e1b20db1 (18 revisions)

https://skia.googlesource.com/skia.git/+log/22cc3be64b3e..b7f5e1b20db1

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://skia-autoroll.corp.goog/r/android-master-autoroll
Please CC djsollen@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Test: Presubmit checks will test this change.
Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
Change-Id: If6509b49a64e7ad6e86ae2a3cb0ab37569912c8b