Merge latest Skia into master (7 commits)

https://skia.googlesource.com/skia.git/+log/593cb94..1da27ef

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