Merge 22a4c27eaef39de325ce86ef6ddea762dd9019cc on remote branch

Change-Id: I2627f7997cd07cf24fe4607f93e8be607234f87d
diff --git a/Android.bp b/Android.bp
index 75157e8..aea7efa 100644
--- a/Android.bp
+++ b/Android.bp
@@ -132,4 +132,8 @@
     rustlibs: [
         "liblibloading",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
 }
diff --git a/cargo2android.json b/cargo2android.json
index d36fb44..6e516e0 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,4 +1,8 @@
 {
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
   "device": true,
   "run": true,
   "tests": true