Merge latest Skia into master (4 commits)

https://skia.googlesource.com/skia.git/+log/0168e04..56ec758

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