diff --git a/common/defs.go b/common/defs.go
index f5b02fe..0001ce1 100644
--- a/common/defs.go
+++ b/common/defs.go
@@ -18,7 +18,7 @@
 	"path/filepath"
 
 	"github.com/google/blueprint"
-	"github.com/google/blueprint/bootstrap"
+	_ "github.com/google/blueprint/bootstrap"
 )
 
 var (
@@ -29,7 +29,7 @@
 
 	srcDir = pctx.VariableConfigMethod("srcDir", Config.SrcDir)
 
-	androidbpCmd = filepath.Join(bootstrap.BinDir, "androidbp")
+	androidbpCmd = filepath.Join("${bootstrap.BinDir}", "androidbp")
 	androidbp    = pctx.StaticRule("androidbp",
 		blueprint.RuleParams{
 			Command:     androidbpCmd + " ${srcDir}/Android.bp $in $out",
@@ -71,3 +71,7 @@
 		},
 		"fromPath")
 )
+
+func init() {
+	pctx.Import("github.com/google/blueprint/bootstrap")
+}
diff --git a/common/glob.go b/common/glob.go
index 5a01cf5..152be94 100644
--- a/common/glob.go
+++ b/common/glob.go
@@ -19,7 +19,6 @@
 	"path/filepath"
 
 	"github.com/google/blueprint"
-	"github.com/google/blueprint/bootstrap"
 
 	"android/soong/glob"
 )
@@ -40,7 +39,7 @@
 // in a build failure with a "missing and no known rule to make it" error.
 
 var (
-	globCmd = filepath.Join(bootstrap.BinDir, "soong_glob")
+	globCmd = filepath.Join("${bootstrap.BinDir}", "soong_glob")
 
 	// globRule rule traverses directories to produce a list of files that match $glob
 	// and writes it to $out if it has changed, and writes the directories to $out.d