Merge latest Skia into master (2 commits)

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

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