Merge latest Skia into master (4 commits)

https://skia.googlesource.com/skia.git/+log/2f3db61..301431d

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