Merge latest Skia into master (13 commits)

https://skia.googlesource.com/skia.git/+log/a69f4cf..99c9796

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