Merge latest Skia into master (7 commits)

https://skia.googlesource.com/skia.git/+log/2229d44..0b83319

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