Merge "Fix leak of mapped zip central directories" am: 41f690ba2a
am: 1d9e63df21

Change-Id: Ib7f601b5c9767d02d64e7920f7d3d7a67b145226