diff --git a/android/mutator.go b/android/mutator.go
index b799432..82376e4 100644
--- a/android/mutator.go
+++ b/android/mutator.go
@@ -243,7 +243,8 @@
 }
 
 func (t *topDownMutatorContext) CreateModule(factory blueprint.ModuleFactory, props ...interface{}) {
-	t.bp.CreateModule(factory, props...)
+	common := []interface{}{&t.Module().base().commonProperties}
+	t.bp.CreateModule(factory, append(common, props...)...)
 }
 
 func (b *bottomUpMutatorContext) MutatorName() string {
diff --git a/ui/build/paths/config.go b/ui/build/paths/config.go
index b169666..100cc65 100644
--- a/ui/build/paths/config.go
+++ b/ui/build/paths/config.go
@@ -79,13 +79,11 @@
 	"dd":       Allowed,
 	"diff":     Allowed,
 	"dlv":      Allowed,
-	"egrep":    Allowed,
 	"expr":     Allowed,
 	"find":     Allowed,
 	"fuser":    Allowed,
 	"getopt":   Allowed,
 	"git":      Allowed,
-	"grep":     Allowed,
 	"gzcat":    Allowed,
 	"gzip":     Allowed,
 	"hexdump":  Allowed,
@@ -132,9 +130,11 @@
 	"dirname":   LinuxOnlyPrebuilt,
 	"du":        LinuxOnlyPrebuilt,
 	"echo":      LinuxOnlyPrebuilt,
+	"egrep":     LinuxOnlyPrebuilt,
 	"env":       LinuxOnlyPrebuilt,
-	"head":      LinuxOnlyPrebuilt,
 	"getconf":   LinuxOnlyPrebuilt,
+	"grep":      LinuxOnlyPrebuilt,
+	"head":      LinuxOnlyPrebuilt,
 	"hostname":  LinuxOnlyPrebuilt,
 	"id":        LinuxOnlyPrebuilt,
 	"ln":        LinuxOnlyPrebuilt,