Merge "libziparchive: verify that gpb flags match"