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

Change-Id: I5b121cc7a2ce33e5a79dbe6cc1203d2ccb70d599