am f17e6387: allow use of unzip version 6.0

Merge commit 'f17e63879c9356d107bda7f8d599f7ce5f449051' into eclair-plus-aosp

* commit 'f17e63879c9356d107bda7f8d599f7ce5f449051':
  allow use of unzip version 6.0