Merge latest Skia into master (3 commits)

https://skia.googlesource.com/skia.git/+log/ad1de45..342977c

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