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

Change-Id: I4b3f7e5845779c94d42c7e78548ed2e085619990