Merge "Roll external/skia 9a725dd94..f20e77bcb (3 commits)"