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

Change-Id: I767f07b922a89203bf69b5e41c0897f81135759e