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

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