Merge latest Skia into master (5 commits)

https://skia.googlesource.com/skia.git/+log/5d72f7d..c4e6cfe

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