Merge "usb: remove duplication in descriptor reading code."