Merge "libziparchive: verify that gpb flags match" into oc-dev am: 91e3f638b7
am: 9a43accb26

Change-Id: I32e77816e59db0b37ac08567556fb2832ab1cf89