Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58f -s ours...
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58f -s ours am: 2b4a6de4 am: 556afe82 -s ours
am: de0f0b8e
Change-Id: I71fa5fa39cc2ffc1dde4a68102399f349ee24d72