Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1  -s ours
am: 2b4a6de426

Change-Id: I20e184d8333c0aff48c326fad67909fcf7dc527e