Merge latest Skia into master (1 commits)

https://skia.googlesource.com/skia.git/+log/480a1c6..197bde9

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