Merge "Use -Werror in external/zlib"