Merge latest Skia into master (3 commits)

https://skia.googlesource.com/skia.git/+log/3f142b6..652ecb5

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