Merge "libziparchive: verify that gpb flags match" am: 04c4f40a82 am: 9244a6b573 am: 234e7683d3
am: aefdc1c2f7

Change-Id: Ic5016ad99012d5421527e41756ccdf9a522c6337