Add stoney ridge x86 variant

Bug: 124445930
Test: compile and deploy to grunt
Change-Id: Ie63217c7c68f5688bf070cbabf9ea5a1b82d3acc
diff --git a/android/arch.go b/android/arch.go
index 797c84c..957a659 100644
--- a/android/arch.go
+++ b/android/arch.go
@@ -165,6 +165,7 @@
 		"sandybridge",
 		"silvermont",
 		"skylake",
+		"stoneyridge",
 		"tigerlake",
 		"whiskeylake",
 		"x86_64",
@@ -179,6 +180,7 @@
 		"sandybridge",
 		"silvermont",
 		"skylake",
+		"stoneyridge",
 		"tigerlake",
 		"whiskeylake",
 	},
@@ -339,6 +341,17 @@
 			"aes_ni",
 			"popcnt",
 		},
+		"stoneyridge": {
+			"ssse3",
+			"sse4",
+			"sse4_1",
+			"sse4_2",
+			"aes_ni",
+			"avx",
+			"avx2",
+			"popcnt",
+			"movbe",
+		},
 		"tigerlake": {
 			"ssse3",
 			"sse4",
@@ -455,6 +468,16 @@
 			"aes_ni",
 			"popcnt",
 		},
+		"stoneyridge": {
+			"ssse3",
+			"sse4",
+			"sse4_1",
+			"sse4_2",
+			"aes_ni",
+			"avx",
+			"avx2",
+			"popcnt",
+		},
 		"tigerlake": {
 			"ssse3",
 			"sse4",
@@ -1522,12 +1545,14 @@
 		{"x86", "ivybridge", "", []string{"x86"}},
 		{"x86", "sandybridge", "", []string{"x86"}},
 		{"x86", "silvermont", "", []string{"x86"}},
+		{"x86", "stoneyridge", "", []string{"x86"}},
 		{"x86", "x86_64", "", []string{"x86"}},
 		{"x86_64", "", "", []string{"x86_64"}},
 		{"x86_64", "haswell", "", []string{"x86_64"}},
 		{"x86_64", "ivybridge", "", []string{"x86_64"}},
 		{"x86_64", "sandybridge", "", []string{"x86_64"}},
 		{"x86_64", "silvermont", "", []string{"x86_64"}},
+		{"x86_64", "stoneyridge", "", []string{"x86_64"}},
 	}
 }