Merge latest Skia into master (4 commits)

https://skia.googlesource.com/skia.git/+log/8199d94..97180af

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