* commit '5c0b5d86': Cherry-pick from AOSP. According to CDD, the usb accessory feature is not mandatory.