Remove unused (and incorrect) flag

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

Change-Id: Ib071a4c6180482d75cc3e6a180ae65370491db20