Merge latest Skia into master (1 commits)

https://skia.googlesource.com/skia.git/+log/986480a..480a1c6

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