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 am: 5fa554a46a
am: 223de992a4

Change-Id: Id39959956c2ce2f8910d69e31ee5fe9a2638e7b6