Remove unused (and incorrect) flag

Change-Id: I5e00bea607f4c9fa8187e45db6c650c1f2b4a745
Set distinct USB configs for ADB/ADB+MTP

Change-Id: Id416cfc844f60b18ef72e8fedef7a344a752a79d