Snap for 11157599 from 1e6adce763ef3134b832ed7a11007bcb49e549af to 24Q1-release

Change-Id: Ice7558b068131d225c78a42b82d342aa12a52abf
diff --git a/Android.bp b/Android.bp
index a317bf5..62a7c18 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
-// 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.
 
-
-
 rust_library {
     name: "libutf8",
     host_supported: true,
@@ -32,7 +30,5 @@
         unit_test: true,
     },
     edition: "2015",
-    rustlibs: [
-        "libutf8",
-    ],
+    rustlibs: ["libutf8"],
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index aefb658..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "run": true,
-  "device": true,
-  "tests": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..c8842d1
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,4 @@
+{
+  "run_cargo": false,
+  "tests": true
+}