diff --git a/android/arch.go b/android/arch.go
index 2d0515f..e777475 100644
--- a/android/arch.go
+++ b/android/arch.go
@@ -417,9 +417,11 @@
 		variants := []string{}
 
 		for _, archVariant := range archVariants[arch] {
+			archVariant := variantReplacer.Replace(archVariant)
 			variants = append(variants, proptools.FieldNameForProperty(archVariant))
 		}
 		for _, feature := range archFeatures[arch] {
+			feature := variantReplacer.Replace(feature)
 			variants = append(variants, proptools.FieldNameForProperty(feature))
 		}
 
diff --git a/cc/config/arm_device.go b/cc/config/arm_device.go
index 5d17d15..94627e7 100644
--- a/cc/config/arm_device.go
+++ b/cc/config/arm_device.go
@@ -156,20 +156,25 @@
 )
 
 func init() {
+	android.RegisterArchFeatures(android.Arm,
+		"neon")
+
 	android.RegisterArchVariants(android.Arm,
 		"armv5te",
-		"armv7_a",
-		"armv7_a_neon",
-		"cortex_a7",
-		"cortex_a8",
-		"cortex_a9",
-		"cortex_a15",
-		"cortex_a53",
-		"cortex_a53_a57",
+		"armv7-a",
+		"armv7-a-neon",
+		"cortex-a7",
+		"cortex-a8",
+		"cortex-a9",
+		"cortex-a15",
+		"cortex-a53",
+		"cortex-a53-a57",
 		"krait",
 		"kryo",
 		"denver")
 
+	android.RegisterArchVariantFeatures(android.Arm, "armv7-a-neon", "neon")
+
 	// Krait and Kryo targets are not supported by GCC, but are supported by Clang,
 	// so override the definitions when building modules with Clang.
 	replaceFirst(armClangCpuVariantCflags["krait"], "-mcpu=cortex-a15", "-mcpu=krait")
diff --git a/cc/config/mips_device.go b/cc/config/mips_device.go
index ccd60d6..42025a2 100644
--- a/cc/config/mips_device.go
+++ b/cc/config/mips_device.go
@@ -133,7 +133,11 @@
 		"mips32r2dsp_fp",
 		"mips32r2dspr2_fp",
 		"mips32r6")
-	android.RegisterArchFeatures(android.Mips, "rev6")
+	android.RegisterArchFeatures(android.Mips,
+		"dspr2",
+		"rev6")
+	android.RegisterArchVariantFeatures(android.Mips, "mips32r2dspr2_fp",
+		"dspr2")
 	android.RegisterArchVariantFeatures(android.Mips, "mips32r6",
 		"rev6")