[automerger skipped] Merge "Migrate platform/system/core/libziparchive to p/system/libziparchive" am: 1b1ac362 am: 7fc15fcb -s ours
am skip reason: Change-Id I357a8c655855949bb0957675510bbaa26b47bc3c with SHA-1 ffa0dcf3 is in history
Change-Id: I6d72ad4b0c9fa4cb5044fd3c3687f4e125343015