Merge "Fix incorrect memory cleanup in SkiaShader."