Merge "Unify zipfile implementations : Step 1."