am 264d42dd: Merge change Idf5bcb58 into eclair

Merge commit '264d42dd1cfb5ce9fc9c29e192623af2c20b2900' into eclair-mr2

* commit '264d42dd1cfb5ce9fc9c29e192623af2c20b2900':
  Fix ant install when -Dadb.device.arg not provided.