Merge latest Skia into master (3 commits)

https://skia.googlesource.com/skia.git/+log/31f96a6..9f4b0ae

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