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

Change-Id: I322c1a08c6acfb0e92b0a0deeffc79e7c5106e2c