Merge "libidmap2: track libziparchive API change." into qt-dev-plus-aosp