Merge "Fix SEGV in libziparchive with malformed zip file."
am: 264a37d12f

Change-Id: I39c2ec3e0a1b81585f6c47620d7dec9687bbc9f7