Merge "Use -Werror in external/zlib"
am: 77813b7ffe

Change-Id: Ic752523752a067dd6ac57e34fd79056d377ec203