Merge latest Skia into master (10 commits)

https://skia.googlesource.com/skia.git/+log/8675d8d..d7e86a5

Test: Presubmit checks will test this change.
Change-Id: Ie3ad1261130d70ade7b5741b6bb025c0f58d52f4