Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5
am: 368f3d273d  -s ours

Change-Id: I5cc4d5761c5d7f2b8bcee551a693c1858a7bebd1