Merge change 21763 into donut

* changes:
  Enable adb forwarding and starting up of monkey server