Merge latest Skia into master (7 commits)

https://skia.googlesource.com/skia.git/+log/9c7dcac..70a309a

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