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

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

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build