Merge "Migrate platform/system/core/libziparchive to p/system/libziparchive"