Snap for 7205268 from 84deda74e0c24ea93382abe2213825c7e03b3f57 to sc-release

Change-Id: I300738f81b24540767962bddb213e9f4eed9a1f8
diff --git a/Android.bp b/Android.bp
index 5abab3c..6ad858e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --device --run --dependencies --tests.
+// This file is generated by cargo2android.py --device --run --dependencies --tests --patch=patches/Android.bp.patch.
 
 package {
     default_applicable_licenses: ["external_rust_crates_num-traits_license"],
@@ -46,6 +46,10 @@
         "default",
         "std",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
     flags: [
         "--cfg has_i128",
         "--cfg has_to_int_unchecked",
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
new file mode 100644
index 0000000..b61b82c
--- /dev/null
+++ b/patches/Android.bp.patch
@@ -0,0 +1,15 @@
+diff --git a/Android.bp b/Android.bp
+index 5abab3c..b920d56 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -46,6 +46,10 @@ rust_library {
+         "default",
+         "std",
+     ],
++    apex_available: [
++        "//apex_available:platform",
++        "com.android.virt",
++    ],
+     flags: [
+         "--cfg has_i128",
+         "--cfg has_to_int_unchecked",