diff --git a/cc/makevars.go b/cc/makevars.go
index bb81dcb9f..8177aa88f 100644
--- a/cc/makevars.go
+++ b/cc/makevars.go
@@ -312,6 +312,7 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string,
 
 	ctx.Strict(makePrefix+"CC", gccCmd(toolchain, "gcc"))
 	ctx.Strict(makePrefix+"CXX", gccCmd(toolchain, "g++"))
+	ctx.Strict(makePrefix+"STRIP", gccCmd(toolchain, "strip"))
 
 	if target.Os == android.Darwin {
 		ctx.Strict(makePrefix+"AR", "${config.MacArPath}")
@@ -328,7 +329,6 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string,
 	if target.Os.Class == android.Device {
 		ctx.Strict(makePrefix+"OBJCOPY", gccCmd(toolchain, "objcopy"))
 		ctx.Strict(makePrefix+"LD", gccCmd(toolchain, "ld"))
-		ctx.Strict(makePrefix+"STRIP", gccCmd(toolchain, "strip"))
 		ctx.Strict(makePrefix+"GCC_VERSION", toolchain.GccVersion())
 		ctx.Strict(makePrefix+"NDK_GCC_VERSION", toolchain.GccVersion())
 		ctx.Strict(makePrefix+"NDK_TRIPLE", config.NDKTriple(toolchain))
diff --git a/ui/build/paths/config.go b/ui/build/paths/config.go
index 548b03858..f044971e6 100644
--- a/ui/build/paths/config.go
+++ b/ui/build/paths/config.go
@@ -83,6 +83,7 @@ var Configuration = map[string]PathConfig{
 	"head":      Allowed,
 	"hexdump":   Allowed,
 	"hostname":  Allowed,
+	"id":        Allowed,
 	"jar":       Allowed,
 	"java":      Allowed,
 	"javap":     Allowed,
@@ -104,11 +105,13 @@ var Configuration = map[string]PathConfig{
 	"readlink":  Allowed,
 	"realpath":  Allowed,
 	"rm":        Allowed,
+	"rmdir":     Allowed,
 	"rsync":     Allowed,
 	"runalarm":  Allowed,
 	"sed":       Allowed,
 	"setsid":    Allowed,
 	"sh":        Allowed,
+	"sha1sum":   Allowed,
 	"sha256sum": Allowed,
 	"sha512sum": Allowed,
 	"sort":      Allowed,