Merge latest Skia into master (4 commits)

https://skia.googlesource.com/skia.git/+log/b357dea..c013892

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