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

Change-Id: I50f875e63d1fbb31e0ae9bb04e6091fc7f0c828c