Merge "Fix the change markers in BigInteger, ZipInputStream, zip_util.c"