Roll external/skia f2ceb999b38e..37e606255efe (2 commits)

https://skia.googlesource.com/skia.git/+log/f2ceb999b38e..37e606255efe

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 nifong@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/+/master/autoroll/README.md

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