Merge "Cherry-pick of external/skia d85db6096..5bf2575a5 (2 commits)"