Merge latest Skia into master (2 commits)

https://skia.googlesource.com/skia.git/+log/f86bc2c..20ece3a

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