Merge "Roll external/skia 974fcc5be50e..6b1aabd4d10a (8 commits)"