Screw'd Bring-up

-Remove generic lunch combos
-Add mka and bacon
-Remove vedor restriction

Change-Id: I4a6cb7a0c1eb4fb303700e033e847088b8796512