Merge "Roll external/skia 086d80bcf..836ff5e40 (11 commits)"