Merge "Use -Werror in external/giflib"