Merge latest Skia into master (10 commits)

https://skia.googlesource.com/skia.git/+log/56ec758..cc70083

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