Merge "Use -Werror in external/webp"
am: 9989434999

Change-Id: I72a8dc4cc161bf8034c56aadc2b8d2a69c9ba8f9