Merge latest Skia into master (3 commits)

https://skia.googlesource.com/skia.git/+log/5521356..5d72f7d

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