am cfd96c9a: am 8eff7f57: Support adb device-targeting arguments in ant scripts.

Merge commit 'cfd96c9a122cbe118da1055702201bb4fd552bc1'

* commit 'cfd96c9a122cbe118da1055702201bb4fd552bc1':
  Support adb device-targeting arguments in ant scripts.