am c47f47b7: am 5d60719e: Merge "Run ZipFile.testzip() during zipfile tests."

* commit 'c47f47b74f6ed6daa83e3f4357cf315a4b617f6e':
  Run ZipFile.testzip() during zipfile tests.