vendorsetup: Handle new jenkins build parameters

* https://github.com/CyanogenMod/hudson/commit/21c0d29e0038cfb61d8e1fd404fb162fe385a093 broke the previous way of adding lunch targets, as it was
    adding a 'bacon' target instead of the full lunch-able target (cm_bacon-$variant).
* use printf and format the combo during the parsing

Change-Id: I0d2c4716bf17cb1a85333662f941d454d0b74e6a
Signed-off-by: Brandon McAnsh <brandon.mcansh@gmail.com>
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 8a03514..8161e1a 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,4 +1,4 @@
-for combo in $(curl -s https://raw.githubusercontent.com/CyanogenMod/hudson/master/cm-build-targets | sed -e 's/#.*$//' | grep cm-12.1 | awk {'print $1'})
+for combo in $(curl -s https://raw.githubusercontent.com/CyanogenMod/hudson/master/cm-build-targets | sed -e 's/#.*$//' | grep cm-12.1 | awk '{printf "cm_%s-%s\n", $1, $2}')
 do
     add_lunch_combo $combo
 done