Merge latest Skia into master (4 commits)

https://skia.googlesource.com/skia.git/+log/874a872..412a86d

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