diff --git a/envsetup.sh b/envsetup.sh
index 05167df341..34bbb600f3 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -538,6 +538,8 @@ function _lunch_meat()
 
     [[ -n "${ANDROID_QUIET_BUILD:-}" ]] || echo
 
+    fixup_common_out_dir
+    
     set_stuff_for_environment
     [[ -n "${ANDROID_QUIET_BUILD:-}" ]] || printconfig