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

Change-Id: I90fc8d44976b063e450580b5bcb1a079ac09604b