diff --git a/scripts/build2stage.sh b/scripts/build2stage.sh
index fb38c36..eff0bd7 100755
--- a/scripts/build2stage.sh
+++ b/scripts/build2stage.sh
@@ -24,6 +24,13 @@
 # Initialize the environment
 source build/envsetup.sh
 
+# Set up the Java environment
+set_stuff_for_environment
+
+# Note: if that stops working, try the lunch command with any build target,
+# For example:
+# lunch aosp_arm-eng
+
 # Make the docs
 make online-sac-docs