Update to new blueprint api for bootstrap.BinDir

And regenerate build.ninja.in

Change-Id: I35e8b0362799f94b33309d3944b411de5dbcf40a

common/defs.go

@@ -18,7 +18,7 @@ import (
 	"path/filepath"
 
 	"github.com/google/blueprint"
-	"github.com/google/blueprint/bootstrap"
+	_ "github.com/google/blueprint/bootstrap"
 )
 
 var (
@@ -29,7 +29,7 @@ var (
 
 	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 @@ var (
 		},
 		"fromPath")
 )
+
+func init() {
+	pctx.Import("github.com/google/blueprint/bootstrap")
+}