Merge latest Skia into master (5 commits)

https://skia.googlesource.com/skia.git/+log/a7d61a6..d4bdee5

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