Merge "Use -Werror in external/zlib" am: 77813b7ffe am: 897d9a491e
am: 5f9c3c5b5c

Change-Id: Ib97d9849f61cdb8650b9b0df22731e4eb52feb06