Merge latest Skia into master (7 commits)

https://skia.googlesource.com/skia.git/+log/d1e67e7..2229d44

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