Remove unused (and incorrect) flag

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