Merge "libzipfile: turn on -Werror"