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 am: 2d37855038
am: 3c3eed744e

Change-Id: I065c6eb98fcd7af9e486a211fb6f8611bcc7a5d3