Merge latest Skia into master (13 commits)

https://skia.googlesource.com/skia.git/+log/e3d4421..e30f758

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