Merge "Add Funai's USB vendor ID to adb."