Merge latest Skia into master (20 commits)

https://skia.googlesource.com/skia.git/+log/4a0a943..aeef561

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