Remove unused (and incorrect) flag
Set distinct USB configs for ADB/ADB+MTP