Merge "Roll external/skia 141df44fd..ae79f32e7 (1 commits)"