Merge "Remove the adb usb vendor id whitelist."