Merge latest Skia into master (1 commits)

https://skia.googlesource.com/skia.git/+log/1517224..4897fb8

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