Merge change I96ff4429 into eclair

* changes:
  Add support for 'android update test-project'.