Merge latest Skia into master (1 commits)

https://skia.googlesource.com/skia.git/+log/d003e24..ad1de45

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