am d628eaca: am f17e6387: allow use of unzip version 6.0

Merge commit 'd628eacae7af10c520df98323250b385212270ca' into eclair-mr2-plus-aosp

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