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

Change-Id: I3a929ddc6eb1833b0653511d810662dcbaab8153