Snap for 7889170 from 6f727a1ec85bded7552f725ecd54a5108a7953ba to sc-v2-release

Change-Id: Iaf0455d6fa1547ec18b809c46c14fd0391456236
diff --git a/Android.bp b/Android.bp
index 8cf8034..2f8bd71 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --device --run --dependencies --tests --features=std.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -134,8 +134,12 @@
         "libcfg_if",
         "liblibc",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
 }
 
 // dependent_library ["feature_list"]
 //   cfg-if-1.0.0
-//   libc-0.2.87
+//   libc-0.2.97
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..b73c7b4
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,11 @@
+{
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "dependencies": true,
+  "device": true,
+  "features": "std",
+  "run": true,
+  "tests": true
+}
\ No newline at end of file