vendorsetup : Update various m7 lunch_combo

Change-Id: I5faf5a750ad38050bfdec905f90e5ce9093c33b2