Remove unused (and incorrect) flag

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

Change-Id: I95cb5c71e0167e915ea451019f2a02d599f5c60e