Merge "Update Skia's NinePatch decoder"