Merge latest Skia into master (17 commits)

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

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