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

* commit '51a1d4e3f629f9a9a20a0c2a04c4f2a7507ee48c':
  Unify zipfile implementations : Step 1.