Merge "Use -Werror in external/webp" am: 9989434999 am: 3b38baff9f
am: 444e88d077

Change-Id: Ife8f2abecc1fe1c16807e3dbe793665be1ca7777