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

Change-Id: I76c1b96121100d2be4d9835ec91158607596a5c2