am 82ce6726: Merge "Rename ZipEntryName to ZipString"

* commit '82ce67260fb0113fd9566264097c13a984e7ac7b':
  Rename ZipEntryName to ZipString