Merge "Ignore OldAndroidZipStreamTest#testZipStream failures with CC."