Snap for 11097608 from 499e4718b98512eaa9309c40bb5da0eab288d01f to 24Q1-release

Change-Id: I860e6f1392f527d25cde18a9c479a548e787bc53
diff --git a/Android.bp b/Android.bp
index c5f37ac..f497e56 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 {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 1d152ce..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "device": true,
-  "run": true,
-  "dep-suffixes": {
-    "bitflags": "-1.3.2"
-  }
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..99df43f
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,6 @@
+{
+  "module_name_overrides": {
+    "libbitflags": "libbitflags-1.3.2"
+  },
+  "run_cargo": false
+}