Remove unused (and incorrect) flag

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

Change-Id: Id416cfc844f60b18ef72e8fedef7a344a752a79d