Merge latest Skia into master (20 commits)

https://skia.googlesource.com/skia.git/+log/1e18aec..5be6c95

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