am 692dc75d: Merge "Rename ZipEntryName to ZipString"

* commit '692dc75d9fbf5c256cd8c66219a930ae0fe9f523':
  Rename ZipEntryName to ZipString