am a8c89ee3: Merge "Reject zip files that have trailing bytes after their CD."

* commit 'a8c89ee35a87de29afc0e828f0b22b537d2cc410':
  Reject zip files that have trailing bytes after their CD.