Revert "Remove support for duplicate file entries."

This reverts commit 5360af4aa1d23fd910680b09fa06f0820db03a9a

Ugh, forgot that make wouldn't make the tests anymore. We're missing the ZipException, I'll reupload in a second.

Change-Id: I8b4d7300cffa1f9f23235e2e33a1cf2b522ba3f3
2 files changed