Upgrade rust/crates/futures-executor to 0.3.13 am: 9313f9d245 am: 1a1c3a8a62 am: 2290adba64

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-executor/+/1662703

Change-Id: I282a6546d364358dc8e6bbb5225bb419d994f43f
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 4fd4ba3..f3ad3ab 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
 {
   "git": {
-    "sha1": "1d53a29ec16ccd5b094fb205edb73591455eb4b6"
+    "sha1": "c91f8691672c7401b1923ab00bf138975c99391a"
   }
 }
diff --git a/Android.bp b/Android.bp
index f905cc9..549eb4a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --dependencies --device --features=thread-pool --patch=patches/Android.bp.patch.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     default_applicable_licenses: [
@@ -62,12 +63,11 @@
 }
 
 // dependent_library ["feature_list"]
-//   futures-core-0.3.12 "alloc,std"
-//   futures-task-0.3.12 "alloc,once_cell,std"
-//   futures-util-0.3.12 "alloc,slab,std"
-//   libc-0.2.86 "default,std"
+//   futures-core-0.3.13 "alloc,std"
+//   futures-task-0.3.13 "alloc,std"
+//   futures-util-0.3.13 "alloc,slab,std"
+//   libc-0.2.92 "default,std"
 //   num_cpus-1.13.0
-//   once_cell-1.5.2 "alloc,std"
-//   pin-project-lite-0.2.4
+//   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
 //   slab-0.4.2
diff --git a/Cargo.toml b/Cargo.toml
index 800bbdb..62cb740 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "futures-executor"
-version = "0.3.12"
+version = "0.3.13"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 description = "Executors for asynchronous tasks based on the futures-rs library.\n"
 homepage = "https://rust-lang.github.io/futures-rs"
@@ -24,15 +24,15 @@
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 [dependencies.futures-core]
-version = "0.3.12"
+version = "0.3.13"
 default-features = false
 
 [dependencies.futures-task]
-version = "0.3.12"
+version = "0.3.13"
 default-features = false
 
 [dependencies.futures-util]
-version = "0.3.12"
+version = "0.3.13"
 default-features = false
 
 [dependencies.num_cpus]
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 143356a..bc1853b 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,7 +1,7 @@
 [package]
 name = "futures-executor"
 edition = "2018"
-version = "0.3.12"
+version = "0.3.13"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/futures-rs"
@@ -17,9 +17,9 @@
 thread-pool = ["std", "num_cpus"]
 
 [dependencies]
-futures-core = { path = "../futures-core", version = "0.3.12", default-features = false }
-futures-task = { path = "../futures-task", version = "0.3.12", default-features = false }
-futures-util = { path = "../futures-util", version = "0.3.12", default-features = false }
+futures-core = { path = "../futures-core", version = "0.3.13", default-features = false }
+futures-task = { path = "../futures-task", version = "0.3.13", default-features = false }
+futures-util = { path = "../futures-util", version = "0.3.13", default-features = false }
 num_cpus = { version = "1.8.0", optional = true }
 
 [dev-dependencies]
diff --git a/METADATA b/METADATA
index bd72b7c..75a29b9 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/futures-executor/futures-executor-0.3.12.crate"
+    value: "https://static.crates.io/crates/futures-executor/futures-executor-0.3.13.crate"
   }
-  version: "0.3.12"
+  version: "0.3.13"
   license_type: NOTICE
   last_upgrade_date {
     year: 2021
-    month: 2
-    day: 9
+    month: 4
+    day: 1
   }
 }
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
index 0d3face..1911beb 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -2,9 +2,9 @@
 index 8b0a7f0..0f6408c 100644
 --- a/Android.bp
 +++ b/Android.bp
-@@ -15,6 +15,10 @@ rust_library {
-         "libfutures_task",
+@@ -56,6 +56,10 @@ rust_library {
          "libfutures_util",
+         "libnum_cpus",
      ],
 +    apex_available: [
 +        "//apex_available:platform",