Merge "Update ziparchive usage to the new API."