Merge "Add Java 1.7 APIs: ZipFile, ZipInputStream, ZipOutputStream"