Merge latest Skia into master (2 commits)

https://skia.googlesource.com/skia.git/+log/70a309a..0831f1b

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