Roll Skia from 8d0f710ef0e0 to ba9a04fb8d5a (8 revisions)

https://skia.googlesource.com/skia.git/+log/8d0f710ef0e0..ba9a04fb8d5a

Manual merge to resolve conflicts.

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