Merge latest Skia into master (6 commits)

https://skia.googlesource.com/skia.git/+log/13071c5..b1f7653

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