[automerger skipped] Migrate to platform/system/libziparchive am: ffa0dcf3...
[automerger skipped] Migrate to platform/system/libziparchive am: ffa0dcf3 am: 963886d8 am: 47394d1e -s ours
am skip reason: Change-Id I357a8c655855949bb0957675510bbaa26b47bc3c with SHA-1 6e83daab is in history
Change-Id: I546fddce054a0109442befef553e03d060c12aa7