Merge "Roll external/skia cd5d14619..347034865 (1 commits)"