am 95a37e75: am 692dc75d: Merge "Rename ZipEntryName to ZipString"

* commit '95a37e756e42507d35c8d16f952cd696f7d6109d':
  Rename ZipEntryName to ZipString