Merge latest Skia into master (5 commits)

https://skia.googlesource.com/skia.git/+log/52fe583..c2e9f6d

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