Merge "Add vendor IDs to adb" into jb-mr2-dev