Snap for 11897273 from aa615593d5d95080291fe8d1858b0b0cf0cd69cd to sdk-release

Change-Id: Iba928f8ac2751a82de95fb3c246f5698d246ae6d
diff --git a/Android.bp b/Android.bp
index 39f3b29..6c532b9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -20,6 +20,7 @@
         "bytemuck_derive",
         "derive",
         "extern_crate_alloc",
+        "extern_crate_std",
     ],
     rustlibs: ["libbytemuck"],
     proc_macros: ["libbytemuck_derive"],
@@ -42,6 +43,7 @@
         "bytemuck_derive",
         "derive",
         "extern_crate_alloc",
+        "extern_crate_std",
     ],
     rustlibs: ["libbytemuck"],
     proc_macros: ["libbytemuck_derive"],
@@ -64,6 +66,7 @@
         "bytemuck_derive",
         "derive",
         "extern_crate_alloc",
+        "extern_crate_std",
     ],
     rustlibs: ["libbytemuck"],
     proc_macros: ["libbytemuck_derive"],
@@ -86,6 +89,7 @@
         "bytemuck_derive",
         "derive",
         "extern_crate_alloc",
+        "extern_crate_std",
     ],
     rustlibs: ["libbytemuck"],
     proc_macros: ["libbytemuck_derive"],
@@ -108,6 +112,7 @@
         "bytemuck_derive",
         "derive",
         "extern_crate_alloc",
+        "extern_crate_std",
     ],
     rustlibs: ["libbytemuck"],
     proc_macros: ["libbytemuck_derive"],
@@ -130,6 +135,7 @@
         "bytemuck_derive",
         "derive",
         "extern_crate_alloc",
+        "extern_crate_std",
     ],
     rustlibs: ["libbytemuck"],
     proc_macros: ["libbytemuck_derive"],
@@ -152,6 +158,7 @@
         "bytemuck_derive",
         "derive",
         "extern_crate_alloc",
+        "extern_crate_std",
     ],
     rustlibs: ["libbytemuck"],
     proc_macros: ["libbytemuck_derive"],
@@ -169,6 +176,7 @@
         "bytemuck_derive",
         "derive",
         "extern_crate_alloc",
+        "extern_crate_std",
     ],
     proc_macros: ["libbytemuck_derive"],
     apex_available: [
diff --git a/cargo_embargo.json b/cargo_embargo.json
index 49c7777..8dfbf3c 100644
--- a/cargo_embargo.json
+++ b/cargo_embargo.json
@@ -1,7 +1,8 @@
 {
   "features": [
     "derive",
-    "extern_crate_alloc"
+    "extern_crate_alloc",
+    "extern_crate_std"
   ],
   "tests": true
 }