am a2125077: Merge "Unify zipfile implementations : Step 1."

* commit 'a2125077e104941f797f93fbe6bfad22ef60a1d8':
  Unify zipfile implementations : Step 1.