Merge "Ignore more libcore.java.util.zip test failures with CC."