vendorsetup.sh remove old m7tmo,m7ul,m7att variants and add combined m7 variant

Change-Id: I49467748a1db5b7fe524134211da87a1a0cb5fcb