Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1  -s ours am: 2b4a6de426 am: 556afe82f2  -s ours am: de0f0b8ecc am: 89054eb706 am: ebcba388f5 am: 1bc2862ac5  -s ours am: c800d82044 am: 497461adc5 am: 02e7225f78 am: 587efe8ee9 am: 745f034705
am: 085efd7931  -s ours

Change-Id: Iec1fde0f14e51971341e2785fb45903ef7185a93