am d271d9a5: Merge change 21763 into donut

Merge commit 'd271d9a503b181b240250ce2664ff22fbf4e763b' into eclair

* commit 'd271d9a503b181b240250ce2664ff22fbf4e763b':
  Enable adb forwarding and starting up of monkey server