Merge "Fix SEGV in libziparchive with malformed zip file." am: 7b39606f65 am: fa44dc0f5d

Change-Id: I06953fe7cc2e5c6d319fa16c23ef83624715648e