tree 2a93dc9ffdda38fae60584f8e86dfe234bbd51ee
parent 186ccf51474d654ec6644c517246f202f26c1b6d
author Ben Wagner <benjaminwagner@google.com> 1519941445 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> 1519943055 +0000

Cherry-pick https://skia-review.googlesource.com/c/skia/+/109812
to skqp/dev branch

Also includes:
https://skia-review.googlesource.com/c/skia/+/109807
https://skia-review.googlesource.com/c/skia/+/109808
https://skia-review.googlesource.com/c/skia/+/109809
https://skia-review.googlesource.com/c/skia/+/109811

This will make it possible to run
Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All on this
branch (which is on the CQ).

No-Tree-Checks: true
No-Try: true
No-Presubmit: true
Change-Id: I7b91aa4a8a3893597bb164a32e5e6b2560a84d9b
Reviewed-On: https://skia-review.googlesource.com/109812
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-By: Eric Boren <borenet@google.com>
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/111620
Reviewed-by: Hal Canary <halcanary@google.com>