Merge latest Skia into master (2 commits)

https://skia.googlesource.com/skia.git/+log/e370cbe..32342f0

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