Upgrade rust/crates/tokio to 1.6.0 and use cargo2android.json to generate bp file

1. Only generate libtokio by cargo2android.json
2. Put all the test targets to patch, which might let future upgrade
   easier.
3. Add some tests removed by previous upgrade back.
4. Disable some tests that doesn't work for Android.

Test: atest
Bug: 189140417

Change-Id: I141d548e667cbf33966e868a6eedbe4b50ab56ed

3 files changed, 7 insertions, 7 deletions

diff --git a/src/runtime/blocking/pool.rs b/src/runtime/blocking/pool.rs
index 791e405..5c9b8ed 100644
--- a/src/runtime/blocking/pool.rs
+++ b/src/runtime/blocking/pool.rs
@@ -61,7 +61,7 @@ struct Shared {
     /// Prior to shutdown, we clean up JoinHandles by having each timed-out
     /// thread join on the previous timed-out thread. This is not strictly
     /// necessary but helps avoid Valgrind false positives, see
-    /// https://github.com/tokio-rs/tokio/commit/646fbae76535e397ef79dbcaacb945d4c829f666
+    /// <https://github.com/tokio-rs/tokio/commit/646fbae76535e397ef79dbcaacb945d4c829f666>
     /// for more information.
     last_exiting_thread: Option<thread::JoinHandle<()>>,
     /// This holds the JoinHandles for all running threads; on shutdown, the thread
@@ -151,7 +151,7 @@ impl BlockingPool {
         self.spawner.inner.condvar.notify_all();
 
         let last_exited_thread = std::mem::take(&mut shared.last_exiting_thread);
-        let workers = std::mem::replace(&mut shared.worker_threads, HashMap::new());
+        let workers = std::mem::take(&mut shared.worker_threads);
 
         drop(shared);
 
diff --git a/src/runtime/driver.rs b/src/runtime/driver.rs
index a0e8e23..7e45977 100644
--- a/src/runtime/driver.rs
+++ b/src/runtime/driver.rs
@@ -23,7 +23,7 @@ cfg_io_driver! {
             let io_handle = io_driver.handle();
 
             let (signal_driver, signal_handle) = create_signal_driver(io_driver)?;
-            let process_driver = create_process_driver(signal_driver)?;
+            let process_driver = create_process_driver(signal_driver);
 
             (Either::A(process_driver), Some(io_handle), signal_handle)
         } else {
@@ -80,7 +80,7 @@ cfg_not_signal_internal! {
 cfg_process_driver! {
     type ProcessDriver = crate::process::unix::driver::Driver;
 
-    fn create_process_driver(signal_driver: SignalDriver) -> io::Result<ProcessDriver> {
+    fn create_process_driver(signal_driver: SignalDriver) -> ProcessDriver {
         crate::process::unix::driver::Driver::new(signal_driver)
     }
 }
@@ -89,8 +89,8 @@ cfg_not_process_driver! {
     cfg_io_driver! {
         type ProcessDriver = SignalDriver;
 
-        fn create_process_driver(signal_driver: SignalDriver) -> io::Result<ProcessDriver> {
-            Ok(signal_driver)
+        fn create_process_driver(signal_driver: SignalDriver) -> ProcessDriver {
+            signal_driver
         }
     }
 }
diff --git a/src/runtime/task/core.rs b/src/runtime/task/core.rs
index 9f7ff55..fb6dafd 100644
--- a/src/runtime/task/core.rs
+++ b/src/runtime/task/core.rs
@@ -279,7 +279,7 @@ impl<T: Future> CoreStage<T> {
             // Safety:: the caller ensures mutal exclusion to the field.
             match mem::replace(unsafe { &mut *ptr }, Stage::Consumed) {
                 Stage::Finished(output) => output,
-                _ => panic!("unexpected task state"),
+                _ => panic!("JoinHandle polled after completion"),
             }
         })
     }