Merge latest Skia into master (8 commits)

https://skia.googlesource.com/skia.git/+log/df1a086..8675d8d

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