Merge change 1730 into donut

* changes:
  Make the ddmlib API use IDevice instead of Device