am dcec9d0e: am 44158945: Merge "Wrap zipfile.write(), writestr() and close()"

* commit 'dcec9d0e28346e8b93f6196e5347f2e386b4e1e6':
  Wrap zipfile.write(), writestr() and close()