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

Change-Id: Iab5c2b9a87085394742799b08ee34ce96d83d4ac