am c0b3ad16: merge from open-source master

Merge commit 'c0b3ad16598a0cc30cfc2fcd3fc21ce1fd2b978f' into kraken

* commit 'c0b3ad16598a0cc30cfc2fcd3fc21ce1fd2b978f':
  adb: Add Qualcomm USB id