Android m preview 1
Merge "Rename ZipEntryName to ZipString"