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

* commit '7522b3d58f9b9f397b8f25c7078273f2c0859693':
  Rename ZipEntryName to ZipString