am 91535cff: Merge "Add vendor IDs to adb" into jb-mr2-dev

* commit '91535cff09af5b0181bffe64e97dcae9d24ba219':
  Add vendor IDs to adb