Merge "idmap2: ZipFile::Open: fix potential memory leak"