am 3537f581: Merge "Add Java 1.7 APIs: ZipFile, ZipInputStream, ZipOutputStream"

* commit '3537f5811df63fa05faeca2bb85364dd03322fca':
  Add Java 1.7 APIs: ZipFile, ZipInputStream, ZipOutputStream