Merge "Use -Werror in external/giflib"
am: 4604b43023

Change-Id: I6cc5b84ba722131d677a74bf6139c2a9d35469f1