Merge "Update skia to use giflib 5.1.1"