Snap for 11085410 from 04fd990946723d93f90e6c060397dae0f4d2d228 to 24D1-release

Change-Id: I503601795ba48420c5c9216bcc64f72f61847871
diff --git a/Android.bp b/Android.bp
index a0a56ce..1e48265 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 {
@@ -40,7 +40,6 @@
 
 rust_library {
     name: "libquickcheck",
-    // has rustc warnings
     host_supported: true,
     crate_name: "quickcheck",
     cargo_env_compat: true,
@@ -69,7 +68,6 @@
 
 rust_test {
     name: "quickcheck_test_src_lib",
-    // has rustc warnings
     host_supported: true,
     crate_name: "quickcheck",
     cargo_env_compat: true,
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index cf6ca9c..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "dependencies": true,
-  "device": true,
-  "run": true,
-  "tests": true
-}
\ No newline at end of file
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
+}