Merge latest Skia into master (6 commits)

https://skia.googlesource.com/skia.git/+log/df85c38..9df70bb

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