Merge "Roll external/skia 60c0c8fcd..22d6c27f3 (29 commits)"