Merge "Revert "DO NOT MERGE nuke  libcore.java.util.zip.ZipFileTest#testDuplicateEntries"" into jb-mr1.1-dev