Merge latest Skia into master (13 commits)

https://skia.googlesource.com/skia.git/+log/be28ee2..3a97054

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