Update usb IDs and remove usbnet to fix windows adb driver install

Change-Id: If63309181c62816c5946af6f891169dac71d733b