Merge latest Skia into master (2 commits)

https://skia.googlesource.com/skia.git/+log/e8b5085..dabe8ac

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