Merge latest Skia into master (7 commits)

https://skia.googlesource.com/skia.git/+log/5e21e09..6599b88

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