Merge latest Skia into master (4 commits)

https://skia.googlesource.com/skia.git/+log/4eed4c8..5395c59

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