Merge latest Skia into master (5 commits)

https://skia.googlesource.com/skia.git/+log/905a94f..70b49fd

Test: Presubmit checks will test this change.
BUG:26535125
Change-Id: I9778dbac10d6f35a9d7a5e1ed322ae74c2cdc8f6