Merge latest Skia into master (2 commits)

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

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