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

Change-Id: I87481c3c37c7dc4049ce6317dd4dea46a55ae3ef