Merge latest Skia into master (2 commits)

https://skia.googlesource.com/skia.git/+log/9ae32a2..98829b9

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