Merge change 2360 into donut

* changes:
  Make 'android update adb' write the USB vendor IDs in hexa.