Merge latest Skia into master (13 commits)

https://skia.googlesource.com/skia.git/+log/cf3f234..31f96a6

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