diff --git a/Android.bp b/Android.bp
index f97f88b..cb18605 100644
--- a/Android.bp
+++ b/Android.bp
@@ -201,9 +201,9 @@
     "libLLVMAArch64Disassembler",
 ]
 
-cc_defaults {
+cc_library_shared {
     host_supported: true,
-    name: "libLLVM-defaults",
+    name: "libLLVM_android",
     defaults: [
         "llvm-defaults",
         "force_build_llvm_components",
@@ -301,16 +301,6 @@
     },
 }
 
-cc_library_shared {
-    name: "libLLVM",
-    defaults: ["libLLVM-defaults"],
-}
-
-cc_library_shared {
-    name: "libLLVM_android",
-    defaults: ["libLLVM-defaults"],
-}
-
 subdirs = [
     "soong",
     "lib",
diff --git a/soong/tblgen.go b/soong/tblgen.go
index ac7a343..825da95 100644
--- a/soong/tblgen.go
+++ b/soong/tblgen.go
@@ -22,6 +22,7 @@
 	"android/soong/genrule"
 
 	"github.com/google/blueprint"
+	"github.com/google/blueprint/proptools"
 )
 
 func init() {
@@ -43,7 +44,7 @@
 )
 
 type tblgenProperties struct {
-	In   string
+	In   *string
 	Outs []string
 }
 
@@ -59,7 +60,7 @@
 var _ genrule.SourceFileGenerator = (*tblgen)(nil)
 
 func (t *tblgen) GenerateAndroidBuildActions(ctx android.ModuleContext) {
-	in := android.PathForModuleSrc(ctx, t.properties.In)
+	in := android.PathForModuleSrc(ctx, proptools.String(t.properties.In))
 
 	includes := []string{
 		"-I " + ctx.ModuleDir(),
diff --git a/tools/gold/Android.bp b/tools/gold/Android.bp
index e7cd79a..dd2b134 100644
--- a/tools/gold/Android.bp
+++ b/tools/gold/Android.bp
@@ -17,6 +17,11 @@
 // For the host only
 // =====================================================
 
+/*
+// This module is disabled while switching the name of libLLVM for the target
+// (and host renderscript tools) to libLLVM_android.so.  This tool need not be
+// built in Android build system as we move to the toolchain branch.  Leaving
+// the file here for posterity.
 cc_library_host_shared {
     name: "LLVMgold",
     defaults: ["llvm-defaults"],
@@ -25,3 +30,4 @@
     include_dirs: ["toolchain/binutils/binutils-2.27/include"],
     compile_multilib: "first",
 }
+*/
diff --git a/tools/llvm-ar/Android.bp b/tools/llvm-ar/Android.bp
index 2cf5157..d28fa42 100644
--- a/tools/llvm-ar/Android.bp
+++ b/tools/llvm-ar/Android.bp
@@ -2,6 +2,11 @@
 // llvm-ar command line tool
 //===---------------------------------------------------------------===
 
+/*
+// This module is disabled while switching the name of libLLVM for the target
+// (and host renderscript tools) to libLLVM_android.so.  This tool need not be
+// built in Android build system as we move to the toolchain branch.  Leaving
+// the file here for posterity.
 cc_binary_host {
     name: "llvm-ar",
     defaults: ["llvm-defaults"],
@@ -12,3 +17,4 @@
         "llvm-ranlib",
     ],
 }
+*/
diff --git a/tools/llvm-symbolizer/Android.bp b/tools/llvm-symbolizer/Android.bp
index c5a1c1b..e4e4af1 100644
--- a/tools/llvm-symbolizer/Android.bp
+++ b/tools/llvm-symbolizer/Android.bp
@@ -18,7 +18,7 @@
             ],
         },
         android: {
-            shared_libs: ["libLLVM"],
+            shared_libs: ["libLLVM_android"],
         },
     },
 }