Merge "Roll external/skia d81977f51..dcbb9d90d (9 commits)"