Merge "Roll external/skia c244c2fbb..60c0c8fcd (5 commits)"