diff --git a/Android.bp b/Android.bp
index c1d664f4c..a9e41d9f2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -94,7 +94,6 @@ bootstrap_go_package {
         "common/config.go",
         "common/defaults.go",
         "common/defs.go",
-        "common/env.go",
         "common/glob.go",
         "common/makevars.go",
         "common/module.go",
@@ -103,6 +102,9 @@ bootstrap_go_package {
         "common/paths.go",
         "common/util.go",
         "common/variable.go",
+
+        // Lock down environment access last
+        "common/env.go",
     ],
     testSrcs: [
         "common/paths_test.go",