Snap for 11078623 from 4eb167967de93e5ec9aeec8f0815e3daf250f992 to 24Q1-release

Change-Id: Ieb311c2de0a8443d0d08a43113851fae03ad2050
diff --git a/Android.bp b/Android.bp
index 6552a93..6809e2e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo_embargo.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -39,8 +39,6 @@
 
 rust_library {
     name: "libatomic_rust",
-    stem: "libatomic",
-    // has rustc warnings
     host_supported: true,
     crate_name: "atomic",
     cargo_env_compat: true,
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 8f47245..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "dependencies": true,
-  "device": true,
-  "features": "fallback,std",
-  "run": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..4b1cd3c
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,6 @@
+{
+  "features": [
+    "fallback",
+    "std"
+  ]
+}