am f591bbc2: am 51a1d4e3: am a2125077: Merge "Unify zipfile implementations : Step 1."

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