Merge latest Skia into master (8 commits)

https://skia.googlesource.com/skia.git/+log/b34727f..e4fd9d0

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