Merge latest Skia into master (2 commits)

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

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