Remove unused (and incorrect) flag

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

Change-Id: Id416cfc844f60b18ef72e8fedef7a344a752a79d