am c3515737: Merge change 2281 into donut

Merge commit 'c35157377ba06eeef32bc6eaf582fd6e4c9805a8'

* commit 'c35157377ba06eeef32bc6eaf582fd6e4c9805a8':
  Moved updateAdb into SdkManager and updated with new adb_usb.ini format.