Merge latest Skia into master (4 commits)

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

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