am 6bcab9f0: am ddf516f8: am 506a536b: Merge "libzipfile: turn on -Werror"

* commit '6bcab9f08020acdfc7a129fa34226ebb1d46a069':
  libzipfile: turn on -Werror