am e18a27b3: Merge "Rename ZipEntryName to ZipString"

* commit 'e18a27b35fc4e6834c36a90acc9d9ec923da41d1':
  Rename ZipEntryName to ZipString