Remove unused (and incorrect) flag

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

Change-Id: Id416cfc844f60b18ef72e8fedef7a344a752a79d