Merge latest Skia into master (3 commits)

https://skia.googlesource.com/skia.git/+log/b92234a..58abc9e

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