Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58f  -s ours am: 2b4a6de4 am: 556afe82  -s ours am: de0f0b8e am: 89054eb7 am: ebcba388 am: 1bc2862a  -s ours am: c800d820 am: 497461ad am: 02e7225f am: 587efe8e am: 745f0347  -s ours
am: 585e6a89

Change-Id: I2aae69158939ff1caae98362f1cbcea65fe2f4c2