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

Change-Id: Ib81a39d60f1d4e7551d759c6da5707c752eaf657