Merge latest Skia into master (23 commits)

https://skia.googlesource.com/skia.git/+log/70b49fd..986480a

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