Merge latest Skia into master (2 commits)

https://skia.googlesource.com/skia.git/+log/757914d..9ae32a2

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