merge from open-source master

Change-Id: I8ff445963424ee9520f5de46f6ca8d2c3313c819
diff --git a/envsetup.sh b/envsetup.sh
index d794281..197c4da 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -432,7 +432,7 @@
 }
 
 # add the default one here
-add_lunch_combo generic-eng
+add_lunch_combo full-eng
 
 # if we're on linux, add the simulator.  There is a special case
 # in lunch to deal with the simulator