Merge "Ignore ZipFileTest and ZipInputStreamTest failures with CC."