am 7ce528ec: am f9e4d727: (-s ours) Merge "Reject zip archives with entry...
am 7ce528ec: am f9e4d727: (-s ours) Merge "Reject zip archives with entry names containing \0." into lmp-dev
* commit '7ce528ec':
Reject zip archives with entry names containing \0.