Merge latest Skia into master (4 commits)

https://skia.googlesource.com/skia.git/+log/e411a07..97eb4fe

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