Merge latest Skia into master (7 commits)

https://skia.googlesource.com/skia.git/+log/f87e2b9..86a4340

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