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

Change-Id: I04571849d6e4140ac505e33338f9ecaa321ff3dd