Fix build files am: b36408f79c

Original change: https://android-review.googlesource.com/c/platform/external/crosvm/+/1684110 Change-Id: I5f9de713d24d69410509d55cfe6007d5a8016735
author: Jorge E. Moreira <jemoreira@google.com> 2021-04-26 22:46:30 +0000
committer: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-04-26 22:46:30 +0000
commit: 8f21e42540e06030310bd3120974bedb0c190d61 (patch)
tree: 3d74ebc226e862b58864eb04911ca5d4ef79582c
parent: 47df7974b1b50cd233685b7013bf4c7d73b3b9dd (diff)
parent: b36408f79c53537b851351b2022c2818388c4903 (diff)
download: crosvm-8f21e42540e06030310bd3120974bedb0c190d61.tar.gz
49 files changed, 876 insertions, 737 deletions
diff --git a/Android.bp b/Android.bp
index 5ea3df5d5..8c7b0f860 100644
--- a/Android.bp
+++ b/Android.bp
@@ -85,6 +85,7 @@ rust_binary {
     name: "crosvm",
     defaults: ["crosvm_defaults"],
     host_supported: true,
+    prefer_rlib: true,
     crate_name: "crosvm",
     srcs: ["src/main.rs"],
 
@@ -93,7 +94,15 @@ rust_binary {
             relative_install_path: "aarch64-linux-bionic",
         },
         linux_glibc_x86_64: {
+            features: [
+                "gdb",
+                "gdbstub",
+            ],
             relative_install_path: "x86_64-linux-gnu",
+            rustlibs: [
+                "libgdbstub",
+                "libthiserror",
+            ],
         },
         darwin: {
             enabled: false,
@@ -140,7 +149,6 @@ rust_binary {
         "liblibc",
         "liblibcras",
         "libminijail_rust",
-        "libmsg_socket",
         "libnet_util",
         "libp9",
         "librand_ish",
@@ -174,6 +182,18 @@ rust_defaults {
             rustlibs: ["libaarch64"],
         },
     },
+    target: {
+        linux_glibc_x86_64: {
+            features: [
+                "gdb",
+                "gdbstub",
+            ],
+            rustlibs: [
+                "libgdbstub",
+                "libthiserror",
+            ],
+        },
+    },
     features: [
         "default",
     ],
@@ -191,7 +211,6 @@ rust_defaults {
         "libkernel_loader",
         "liblibc",
         "libminijail_rust",
-        "libmsg_socket",
         "libnet_util",
         "libp9",
         "librand_ish",
@@ -270,7 +289,6 @@ rust_defaults {
         "libkernel_loader",
         "liblibc",
         "libminijail_rust",
-        "libmsg_socket",
         "libnet_util",
         "libp9",
         "librand_ish",
@@ -321,6 +339,16 @@ rust_library {
                 "gfxstream",
             ],
         },
+        linux_glibc_x86_64: {
+            features: [
+                "gdb",
+                "gdbstub",
+            ],
+            rustlibs: [
+                "libgdbstub",
+                "libthiserror",
+            ],
+        },
     },
     arch: {
         x86_64: {
@@ -351,7 +379,6 @@ rust_library {
         "liblibc",
         "liblibcras",
         "libminijail_rust",
-        "libmsg_socket",
         "libnet_util",
         "libp9",
         "librand_ish",
diff --git a/aarch64/Android.bp b/aarch64/Android.bp
index e35f25b84..ec4e6704c 100644
--- a/aarch64/Android.bp
+++ b/aarch64/Android.bp
@@ -130,8 +130,6 @@ rust_library {
 //   ../kvm/src/lib.rs
 //   ../kvm_sys/src/lib.rs
 //   ../linux_input_sys/src/lib.rs
-//   ../msg_socket/msg_on_socket_derive/msg_on_socket_derive.rs
-//   ../msg_socket/src/lib.rs
 //   ../net_sys/src/lib.rs
 //   ../net_util/src/lib.rs
 //   ../power_monitor/src/lib.rs
diff --git a/acpi_tables/Android.bp b/acpi_tables/Android.bp
index 22f222065..7d8e9978d 100644
--- a/acpi_tables/Android.bp
+++ b/acpi_tables/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -53,10 +54,10 @@ rust_library {
 //   ../assertions/src/lib.rs
 //   ../data_model/src/lib.rs
 //   ../tempfile/src/lib.rs
-//   libc-0.2.87 "default,std"
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   libc-0.2.93 "default,std"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   syn-1.0.61 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   syn-1.0.70 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
 //   unicode-xid-0.2.1 "default"
diff --git a/arch/Android.bp b/arch/Android.bp
index 943e0750e..ee2b572a0 100644
--- a/arch/Android.bp
+++ b/arch/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace --features=gdb.
+// NOTE: The --features=gdb should be applied only to the host (not the device) and there are inline changes to achieve this
 
 package {
     // See: http://go/android-license-faq
@@ -17,6 +18,17 @@ rust_defaults {
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2018",
+    target: {
+        linux_glibc_x86_64: {
+            features: [
+                "gdb",
+                "gdbstub",
+            ],
+            rustlibs: [
+                "libgdbstub",
+            ],
+        },
+    },
     rustlibs: [
         "libacpi_tables",
         "libbase_rust",
@@ -25,7 +37,6 @@ rust_defaults {
         "libkernel_cmdline",
         "liblibc",
         "libminijail_rust",
-        "libmsg_socket",
         "libpower_monitor",
         "libresources",
         "libsync_rust",
@@ -58,6 +69,17 @@ rust_library {
     crate_name: "arch",
     srcs: ["src/lib.rs"],
     edition: "2018",
+    target: {
+        linux_glibc_x86_64: {
+            features: [
+                "gdb",
+                "gdbstub",
+            ],
+            rustlibs: [
+                "libgdbstub",
+            ],
+        },
+    },
     rustlibs: [
         "libacpi_tables",
         "libbase_rust",
@@ -66,7 +88,6 @@ rust_library {
         "libkernel_cmdline",
         "liblibc",
         "libminijail_rust",
-        "libmsg_socket",
         "libpower_monitor",
         "libresources",
         "libsync_rust",
@@ -105,8 +126,6 @@ rust_library {
 //   ../kvm/src/lib.rs
 //   ../kvm_sys/src/lib.rs
 //   ../linux_input_sys/src/lib.rs
-//   ../msg_socket/msg_on_socket_derive/msg_on_socket_derive.rs
-//   ../msg_socket/src/lib.rs
 //   ../net_sys/src/lib.rs
 //   ../net_util/src/lib.rs
 //   ../power_monitor/src/lib.rs
@@ -126,10 +145,11 @@ rust_library {
 //   ../vm_control/src/lib.rs
 //   ../vm_memory/src/lib.rs
 //   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
+//   async-trait-0.1.48
 //   autocfg-1.0.1
 //   base-0.1.0
 //   bitflags-1.2.1 "default"
+//   cfg-if-0.1.10
 //   cfg-if-1.0.0
 //   downcast-rs-1.2.0 "default,std"
 //   futures-0.3.13 "alloc,async-await,default,executor,futures-executor,std"
@@ -141,12 +161,15 @@ rust_library {
 //   futures-sink-0.3.13 "alloc,std"
 //   futures-task-0.3.13 "alloc,std"
 //   futures-util-0.3.13 "alloc,async-await,async-await-macro,channel,futures-channel,futures-io,futures-macro,futures-sink,io,memchr,proc-macro-hack,proc-macro-nested,sink,slab,std"
+//   gdbstub-0.4.4 "alloc,default,std"
 //   getrandom-0.2.2 "std"
 //   intrusive-collections-0.9.0 "alloc,default"
-//   libc-0.2.87 "default,std"
+//   libc-0.2.88 "default,std"
 //   log-0.4.14
+//   managed-0.8.0 "alloc"
 //   memchr-2.3.4 "default,std"
 //   memoffset-0.5.6 "default"
+//   num-traits-0.2.14
 //   paste-1.0.4
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
@@ -162,10 +185,10 @@ rust_library {
 //   rand_core-0.6.2 "alloc,getrandom,std"
 //   remain-0.2.2
 //   remove_dir_all-0.5.3
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
+//   serde-1.0.124 "default,derive,serde_derive,std"
+//   serde_derive-1.0.124 "default"
 //   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   syn-1.0.63 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   tempfile-3.2.0
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
diff --git a/assertions/Android.bp b/assertions/Android.bp
index 429ca544c..5692b5930 100644
--- a/assertions/Android.bp
+++ b/assertions/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
diff --git a/base/Android.bp b/base/Android.bp
index ade0332bd..003ff41bc 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -21,8 +22,12 @@ rust_defaults {
         "libcros_async",
         "libdata_model",
         "liblibc",
+        "libserde",
+        "libserde_json",
+        "libsmallvec",
         "libsync_rust",
         "libsys_util",
+        "libthiserror",
     ],
 }
 
@@ -51,8 +56,12 @@ rust_library {
         "libcros_async",
         "libdata_model",
         "liblibc",
+        "libserde",
+        "libserde_json",
+        "libsmallvec",
         "libsync_rust",
         "libsys_util",
+        "libthiserror",
     ],
 }
 
@@ -64,27 +73,33 @@ rust_library {
 //   ../sync/src/lib.rs
 //   ../sys_util/poll_token_derive/poll_token_derive.rs
 //   ../sys_util/src/lib.rs
-//   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
 //   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
-//   futures-0.3.13 "alloc"
-//   futures-channel-0.3.13 "alloc,futures-sink,sink"
-//   futures-core-0.3.13 "alloc"
-//   futures-io-0.3.13
-//   futures-sink-0.3.13 "alloc"
-//   futures-task-0.3.13 "alloc"
-//   futures-util-0.3.13 "alloc,futures-sink,sink"
-//   libc-0.2.87 "default,std"
-//   paste-1.0.4
+//   async-trait-0.1.50
+//   autocfg-1.0.1
+//   futures-0.3.14 "alloc"
+//   futures-channel-0.3.14 "alloc,futures-sink,sink"
+//   futures-core-0.3.14 "alloc"
+//   futures-io-0.3.14
+//   futures-sink-0.3.14 "alloc"
+//   futures-task-0.3.14 "alloc"
+//   futures-util-0.3.14 "alloc,futures-sink,sink"
+//   intrusive-collections-0.9.0 "alloc,default"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
+//   memoffset-0.5.6 "default"
+//   paste-1.0.5
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   slab-0.4.3 "default,std"
+//   smallvec-1.6.1
+//   syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
 //   unicode-xid-0.2.1 "default"
diff --git a/bit_field/Android.bp b/bit_field/Android.bp
index 35ef4ced9..e421b4aa0 100644
--- a/bit_field/Android.bp
+++ b/bit_field/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace --no-subdir.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -87,7 +88,7 @@ rust_library {
 }
 
 // dependent_library ["feature_list"]
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   syn-1.0.61 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
+//   syn-1.0.70 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
 //   unicode-xid-0.2.1 "default"
diff --git a/bit_field/bit_field_derive/Android.bp b/bit_field/bit_field_derive/Android.bp
index e158a2bd4..c667ae41f 100644
--- a/bit_field/bit_field_derive/Android.bp
+++ b/bit_field/bit_field_derive/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -38,7 +39,7 @@ rust_proc_macro {
 }
 
 // dependent_library ["feature_list"]
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   syn-1.0.61 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
+//   syn-1.0.70 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
 //   unicode-xid-0.2.1 "default"
diff --git a/cros_async/Android.bp b/cros_async/Android.bp
index a36793818..d9ed6dd7d 100644
--- a/cros_async/Android.bp
+++ b/cros_async/Android.bp
@@ -22,6 +22,9 @@ rust_defaults {
         "libasync_task",
         "libdata_model",
         "libfutures",
+	"libfutures_executor",
+	"libfutures_util",
+	"libintrusive_collections",
         "libio_uring",
         "liblibc",
         "libpin_utils",
@@ -64,6 +67,7 @@ rust_library {
         "libasync_task",
         "libdata_model",
         "libfutures",
+	"libintrusive_collections",  // added manually
         "libio_uring",
         "liblibc",
         "libpin_utils",
diff --git a/crosvm_plugin/Android.bp b/crosvm_plugin/Android.bp
index 0c0d71bd3..bf0e21591 100644
--- a/crosvm_plugin/Android.bp
+++ b/crosvm_plugin/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 // dependent_library ["feature_list"]
 //   ../assertions/src/lib.rs
@@ -8,54 +9,54 @@
 //   ../io_uring/src/lib.rs
 //   ../kvm/src/lib.rs
 //   ../kvm_sys/src/lib.rs
-//   ../msg_socket/msg_on_socket_derive/msg_on_socket_derive.rs
-//   ../msg_socket/src/lib.rs
 //   ../protos/src/lib.rs "kvm_sys,plugin"
 //   ../sync/src/lib.rs
 //   ../sys_util/poll_token_derive/poll_token_derive.rs
 //   ../sys_util/src/lib.rs
-//   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
 //   ../vm_memory/src/lib.rs
 //   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
-//   base-0.1.0
+//   async-trait-0.1.50
+//   autocfg-1.0.1
+//   bitflags-1.2.1 "default"
 //   cfg-if-1.0.0
-//   futures-0.3.13 "alloc,async-await,default,executor,futures-executor,std"
-//   futures-channel-0.3.13 "alloc,futures-sink,sink,std"
-//   futures-core-0.3.13 "alloc,std"
-//   futures-executor-0.3.13 "std"
-//   futures-io-0.3.13 "std"
-//   futures-macro-0.3.13
-//   futures-sink-0.3.13 "alloc,std"
-//   futures-task-0.3.13 "alloc,std"
-//   futures-util-0.3.13 "alloc,async-await,async-await-macro,channel,futures-channel,futures-io,futures-macro,futures-sink,io,memchr,proc-macro-hack,proc-macro-nested,sink,slab,std"
+//   either-1.6.1 "default,use_std"
+//   futures-0.3.14 "alloc"
+//   futures-channel-0.3.14 "alloc,futures-sink,sink"
+//   futures-core-0.3.14 "alloc"
+//   futures-io-0.3.14
+//   futures-sink-0.3.14 "alloc"
+//   futures-task-0.3.14 "alloc"
+//   futures-util-0.3.14 "alloc,futures-sink,sink"
 //   getrandom-0.2.2 "std"
-//   libc-0.2.87 "default,std"
+//   intrusive-collections-0.9.0 "alloc,default"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
 //   log-0.4.14
-//   memchr-2.3.4 "default,std"
-//   paste-1.0.4
+//   memoffset-0.5.6 "default"
+//   paste-1.0.5
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
 //   ppv-lite86-0.2.10 "simd,std"
-//   proc-macro-hack-0.5.19
-//   proc-macro-nested-0.1.7
-//   proc-macro2-1.0.24 "default,proc-macro"
-//   protobuf-2.22.0
-//   protobuf-codegen-2.22.0
-//   protoc-2.22.0
-//   protoc-rust-2.22.0
+//   proc-macro2-1.0.26 "default,proc-macro"
+//   protobuf-2.22.1
+//   protobuf-codegen-2.22.1
+//   protoc-2.22.1
+//   protoc-rust-2.22.1
 //   quote-1.0.9 "default,proc-macro"
 //   rand-0.8.3 "alloc,default,getrandom,libc,rand_chacha,rand_hc,std,std_rng"
 //   rand_chacha-0.3.0 "std"
 //   rand_core-0.6.2 "alloc,getrandom,std"
 //   remove_dir_all-0.5.3
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   slab-0.4.3 "default,std"
+//   smallvec-1.6.1
+//   syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   tempfile-3.2.0
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
 //   unicode-xid-0.2.1 "default"
-//   which-4.0.2
+//   which-4.1.0
diff --git a/data_model/Android.bp b/data_model/Android.bp
index d81159d9a..c885de7a0 100644
--- a/data_model/Android.bp
+++ b/data_model/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -53,10 +54,10 @@ rust_library {
 
 // dependent_library ["feature_list"]
 //   ../assertions/src/lib.rs
-//   libc-0.2.87 "default,std"
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   libc-0.2.93 "default,std"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   syn-1.0.61 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   syn-1.0.70 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
 //   unicode-xid-0.2.1 "default"
diff --git a/devices/Android.bp b/devices/Android.bp
index f298a9b07..6b3cebace 100644
--- a/devices/Android.bp
+++ b/devices/Android.bp
@@ -36,13 +36,14 @@ rust_defaults {
         "liblibcras",
         "liblinux_input_sys",
         "libminijail_rust",
-        "libmsg_socket",
         "libnet_sys",
         "libnet_util",
         "libp9",
         "libpower_monitor",
         "librand_ish",
         "libresources",
+	"libserde",
+	"libsmallvec",
         "libsync_rust",
         "libsys_util",
         "libsyscall_defines",
@@ -54,10 +55,10 @@ rust_defaults {
         "libvirtio_sys",
         "libvm_control",
         "libvm_memory",
+	"libvmm_vhost",
     ],
     proc_macros: [
         "libenumn",
-        "libmsg_on_socket_derive",
         "libremain",
     ],
 }
@@ -137,7 +138,6 @@ rust_library {
         "liblibcras",
         "liblinux_input_sys",
         "libminijail_rust",
-        "libmsg_socket",
         "libnet_sys",
         "libnet_util",
         "libp9",
@@ -145,6 +145,8 @@ rust_library {
         "librand_ish",
         "libresources",
         "librutabaga_gfx",  // added manually
+	"libserde",  // added manually
+	"libsmallvec",
         "libsync_rust",
         "libsys_util",
         "libsyscall_defines",
@@ -155,10 +157,10 @@ rust_library {
         "libvirtio_sys",
         "libvm_control",
         "libvm_memory",
+	"libvmm_vhost",  // added manually
     ],
     proc_macros: [
         "libenumn",
-        "libmsg_on_socket_derive",
         "libremain",
     ],
 }
@@ -187,8 +189,6 @@ rust_library {
 //   ../kvm/src/lib.rs
 //   ../kvm_sys/src/lib.rs
 //   ../linux_input_sys/src/lib.rs
-//   ../msg_socket/msg_on_socket_derive/msg_on_socket_derive.rs
-//   ../msg_socket/src/lib.rs
 //   ../net_sys/src/lib.rs
 //   ../net_util/src/lib.rs
 //   ../power_monitor/src/lib.rs
diff --git a/disk/Android.bp b/disk/Android.bp
index d747efb4f..8ad224e42 100644
--- a/disk/Android.bp
+++ b/disk/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -81,36 +82,43 @@ rust_library {
 //   ../sync/src/lib.rs
 //   ../sys_util/poll_token_derive/poll_token_derive.rs
 //   ../sys_util/src/lib.rs
-//   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
 //   ../vm_memory/src/lib.rs
 //   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
+//   async-trait-0.1.50
+//   autocfg-1.0.1
+//   bitflags-1.2.1 "default"
 //   cfg-if-1.0.0
-//   futures-0.3.13 "alloc"
-//   futures-channel-0.3.13 "alloc,futures-sink,sink"
-//   futures-core-0.3.13 "alloc"
-//   futures-io-0.3.13
-//   futures-sink-0.3.13 "alloc"
-//   futures-task-0.3.13 "alloc"
-//   futures-util-0.3.13 "alloc,futures-sink,sink"
+//   futures-0.3.14 "alloc"
+//   futures-channel-0.3.14 "alloc,futures-sink,sink"
+//   futures-core-0.3.14 "alloc"
+//   futures-io-0.3.14
+//   futures-sink-0.3.14 "alloc"
+//   futures-task-0.3.14 "alloc"
+//   futures-util-0.3.14 "alloc,futures-sink,sink"
 //   getrandom-0.2.2 "std"
-//   libc-0.2.87 "default,std"
-//   paste-1.0.4
+//   intrusive-collections-0.9.0 "alloc,default"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
+//   memoffset-0.5.6 "default"
+//   paste-1.0.5
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
 //   ppv-lite86-0.2.10 "simd,std"
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
 //   rand-0.8.3 "alloc,default,getrandom,libc,rand_chacha,rand_hc,std,std_rng"
 //   rand_chacha-0.3.0 "std"
 //   rand_core-0.6.2 "alloc,getrandom,std"
 //   remain-0.2.2
 //   remove_dir_all-0.5.3
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   slab-0.4.3 "default,std"
+//   smallvec-1.6.1
+//   syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   tempfile-3.2.0
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
diff --git a/enumn/Android.bp b/enumn/Android.bp
index 92d27e0f2..501a4f988 100644
--- a/enumn/Android.bp
+++ b/enumn/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -41,7 +42,7 @@ rust_proc_macro {
 }
 
 // dependent_library ["feature_list"]
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   syn-1.0.61 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
+//   syn-1.0.70 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
 //   unicode-xid-0.2.1 "default"
diff --git a/fuse/Android.bp b/fuse/Android.bp
index 74e5cebe2..e9ed86b2f 100644
--- a/fuse/Android.bp
+++ b/fuse/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -68,28 +69,34 @@ rust_library {
 //   ../sync/src/lib.rs
 //   ../sys_util/poll_token_derive/poll_token_derive.rs
 //   ../sys_util/src/lib.rs
-//   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
 //   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
+//   async-trait-0.1.50
+//   autocfg-1.0.1
 //   bitflags-1.2.1 "default"
-//   futures-0.3.13 "alloc"
-//   futures-channel-0.3.13 "alloc,futures-sink,sink"
-//   futures-core-0.3.13 "alloc"
-//   futures-io-0.3.13
-//   futures-sink-0.3.13 "alloc"
-//   futures-task-0.3.13 "alloc"
-//   futures-util-0.3.13 "alloc,futures-sink,sink"
-//   libc-0.2.87 "default,std"
-//   paste-1.0.4
+//   futures-0.3.14 "alloc"
+//   futures-channel-0.3.14 "alloc,futures-sink,sink"
+//   futures-core-0.3.14 "alloc"
+//   futures-io-0.3.14
+//   futures-sink-0.3.14 "alloc"
+//   futures-task-0.3.14 "alloc"
+//   futures-util-0.3.14 "alloc,futures-sink,sink"
+//   intrusive-collections-0.9.0 "alloc,default"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
+//   memoffset-0.5.6 "default"
+//   paste-1.0.5
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   slab-0.4.3 "default,std"
+//   smallvec-1.6.1
+//   syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
 //   unicode-xid-0.2.1 "default"
diff --git a/gpu_display/Android.bp b/gpu_display/Android.bp
index f3d06407e..440311b5e 100644
--- a/gpu_display/Android.bp
+++ b/gpu_display/Android.bp
@@ -114,28 +114,34 @@ wayland_protocol_codegen {
 //   ../sync/src/lib.rs
 //   ../sys_util/poll_token_derive/poll_token_derive.rs
 //   ../sys_util/src/lib.rs
-//   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
 //   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
+//   async-trait-0.1.50
+//   autocfg-1.0.1
 //   cc-1.0.25
-//   futures-0.3.13 "alloc"
-//   futures-channel-0.3.13 "alloc,futures-sink,sink"
-//   futures-core-0.3.13 "alloc"
-//   futures-io-0.3.13
-//   futures-sink-0.3.13 "alloc"
-//   futures-task-0.3.13 "alloc"
-//   futures-util-0.3.13 "alloc,futures-sink,sink"
-//   libc-0.2.87 "default,std"
-//   paste-1.0.4
+//   futures-0.3.14 "alloc"
+//   futures-channel-0.3.14 "alloc,futures-sink,sink"
+//   futures-core-0.3.14 "alloc"
+//   futures-io-0.3.14
+//   futures-sink-0.3.14 "alloc"
+//   futures-task-0.3.14 "alloc"
+//   futures-util-0.3.14 "alloc,futures-sink,sink"
+//   intrusive-collections-0.9.0 "alloc,default"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
+//   memoffset-0.5.6 "default"
+//   paste-1.0.5
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   slab-0.4.3 "default,std"
+//   smallvec-1.6.1
+//   syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
 //   unicode-xid-0.2.1 "default"
diff --git a/hypervisor/Android.bp b/hypervisor/Android.bp
index f7887dbe8..ba7c94593 100644
--- a/hypervisor/Android.bp
+++ b/hypervisor/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -26,7 +27,7 @@ rust_defaults {
         "libkvm",
         "libkvm_sys",
         "liblibc",
-        "libmsg_socket",
+        "libserde",
         "libsync_rust",
         "libvm_memory",
     ],
@@ -62,7 +63,7 @@ rust_library {
         "libkvm",
         "libkvm_sys",
         "liblibc",
-        "libmsg_socket",
+        "libserde",
         "libsync_rust",
         "libvm_memory",
     ],
@@ -80,40 +81,39 @@ rust_library {
 //   ../io_uring/src/lib.rs
 //   ../kvm/src/lib.rs
 //   ../kvm_sys/src/lib.rs
-//   ../msg_socket/msg_on_socket_derive/msg_on_socket_derive.rs
-//   ../msg_socket/src/lib.rs
 //   ../sync/src/lib.rs
 //   ../sys_util/poll_token_derive/poll_token_derive.rs
 //   ../sys_util/src/lib.rs
-//   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
 //   ../vm_memory/src/lib.rs
 //   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
-//   base-0.1.0
+//   async-trait-0.1.50
+//   autocfg-1.0.1
+//   bitflags-1.2.1 "default"
 //   downcast-rs-1.2.0 "default,std"
-//   futures-0.3.13 "alloc,async-await,default,executor,futures-executor,std"
-//   futures-channel-0.3.13 "alloc,futures-sink,sink,std"
-//   futures-core-0.3.13 "alloc,std"
-//   futures-executor-0.3.13 "std"
-//   futures-io-0.3.13 "std"
-//   futures-macro-0.3.13
-//   futures-sink-0.3.13 "alloc,std"
-//   futures-task-0.3.13 "alloc,std"
-//   futures-util-0.3.13 "alloc,async-await,async-await-macro,channel,futures-channel,futures-io,futures-macro,futures-sink,io,memchr,proc-macro-hack,proc-macro-nested,sink,slab,std"
-//   libc-0.2.87 "default,std"
-//   memchr-2.3.4 "default,std"
-//   paste-1.0.4
+//   futures-0.3.14 "alloc"
+//   futures-channel-0.3.14 "alloc,futures-sink,sink"
+//   futures-core-0.3.14 "alloc"
+//   futures-io-0.3.14
+//   futures-sink-0.3.14 "alloc"
+//   futures-task-0.3.14 "alloc"
+//   futures-util-0.3.14 "alloc,futures-sink,sink"
+//   intrusive-collections-0.9.0 "alloc,default"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
+//   memoffset-0.5.6 "default"
+//   paste-1.0.5
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
-//   proc-macro-hack-0.5.19
-//   proc-macro-nested-0.1.7
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   slab-0.4.3 "default,std"
+//   smallvec-1.6.1
+//   syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
 //   unicode-xid-0.2.1 "default"
diff --git a/io_uring/Android.bp b/io_uring/Android.bp
index b4d8c5ed2..da6b76379 100644
--- a/io_uring/Android.bp
+++ b/io_uring/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -22,7 +23,6 @@ rust_defaults {
         "liblibc",
         "libsync_rust",
         "libsys_util",
-        "libsyscall_defines",
         "libtempfile",
     ],
 }
@@ -52,7 +52,6 @@ rust_library {
         "liblibc",
         "libsync_rust",
         "libsys_util",
-        "libsyscall_defines",
     ],
 }
 
@@ -62,12 +61,14 @@ rust_library {
 //   ../sync/src/lib.rs
 //   ../sys_util/poll_token_derive/poll_token_derive.rs
 //   ../sys_util/src/lib.rs
-//   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
-//   libc-0.2.87 "default,std"
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   syn-1.0.61 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   syn-1.0.70 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
 //   unicode-xid-0.2.1 "default"
diff --git a/kernel_cmdline/Android.bp b/kernel_cmdline/Android.bp
index ffcbc2302..6d8b52f77 100644
--- a/kernel_cmdline/Android.bp
+++ b/kernel_cmdline/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -48,4 +49,4 @@ rust_library {
 }
 
 // dependent_library ["feature_list"]
-//   libc-0.2.87 "default,std"
+//   libc-0.2.93 "default,std"
diff --git a/kernel_loader/Android.bp b/kernel_loader/Android.bp
index 89060ffdd..afbdcc0b8 100644
--- a/kernel_loader/Android.bp
+++ b/kernel_loader/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -62,35 +63,42 @@ rust_library {
 //   ../sync/src/lib.rs
 //   ../sys_util/poll_token_derive/poll_token_derive.rs
 //   ../sys_util/src/lib.rs
-//   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
 //   ../vm_memory/src/lib.rs
 //   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
+//   async-trait-0.1.50
+//   autocfg-1.0.1
+//   bitflags-1.2.1 "default"
 //   cfg-if-1.0.0
-//   futures-0.3.13 "alloc"
-//   futures-channel-0.3.13 "alloc,futures-sink,sink"
-//   futures-core-0.3.13 "alloc"
-//   futures-io-0.3.13
-//   futures-sink-0.3.13 "alloc"
-//   futures-task-0.3.13 "alloc"
-//   futures-util-0.3.13 "alloc,futures-sink,sink"
+//   futures-0.3.14 "alloc"
+//   futures-channel-0.3.14 "alloc,futures-sink,sink"
+//   futures-core-0.3.14 "alloc"
+//   futures-io-0.3.14
+//   futures-sink-0.3.14 "alloc"
+//   futures-task-0.3.14 "alloc"
+//   futures-util-0.3.14 "alloc,futures-sink,sink"
 //   getrandom-0.2.2 "std"
-//   libc-0.2.87 "default,std"
-//   paste-1.0.4
+//   intrusive-collections-0.9.0 "alloc,default"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
+//   memoffset-0.5.6 "default"
+//   paste-1.0.5
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
 //   ppv-lite86-0.2.10 "simd,std"
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
 //   rand-0.8.3 "alloc,default,getrandom,libc,rand_chacha,rand_hc,std,std_rng"
 //   rand_chacha-0.3.0 "std"
 //   rand_core-0.6.2 "alloc,getrandom,std"
 //   remove_dir_all-0.5.3
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   slab-0.4.3 "default,std"
+//   smallvec-1.6.1
+//   syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   tempfile-3.2.0
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
diff --git a/kvm/Android.bp b/kvm/Android.bp
index ce708cefc..020c6120d 100644
--- a/kvm/Android.bp
+++ b/kvm/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -22,7 +23,6 @@ rust_defaults {
         "libdata_model",
         "libkvm_sys",
         "liblibc",
-        "libmsg_socket",
         "libsync_rust",
         "libvm_memory",
     ],
@@ -54,7 +54,6 @@ rust_defaults {
         "libkvm",
         "libkvm_sys",
         "liblibc",
-        "libmsg_socket",
         "libsync_rust",
         "libvm_memory",
     ],
@@ -117,7 +116,6 @@ rust_library {
         "libdata_model",
         "libkvm_sys",
         "liblibc",
-        "libmsg_socket",
         "libsync_rust",
         "libvm_memory",
     ],
@@ -130,39 +128,38 @@ rust_library {
 //   ../data_model/src/lib.rs
 //   ../io_uring/src/lib.rs
 //   ../kvm_sys/src/lib.rs
-//   ../msg_socket/msg_on_socket_derive/msg_on_socket_derive.rs
-//   ../msg_socket/src/lib.rs
 //   ../sync/src/lib.rs
 //   ../sys_util/poll_token_derive/poll_token_derive.rs
 //   ../sys_util/src/lib.rs
-//   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
 //   ../vm_memory/src/lib.rs
 //   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
-//   base-0.1.0
-//   futures-0.3.13 "alloc,async-await,default,executor,futures-executor,std"
-//   futures-channel-0.3.13 "alloc,futures-sink,sink,std"
-//   futures-core-0.3.13 "alloc,std"
-//   futures-executor-0.3.13 "std"
-//   futures-io-0.3.13 "std"
-//   futures-macro-0.3.13
-//   futures-sink-0.3.13 "alloc,std"
-//   futures-task-0.3.13 "alloc,std"
-//   futures-util-0.3.13 "alloc,async-await,async-await-macro,channel,futures-channel,futures-io,futures-macro,futures-sink,io,memchr,proc-macro-hack,proc-macro-nested,sink,slab,std"
-//   libc-0.2.87 "default,std"
-//   memchr-2.3.4 "default,std"
-//   paste-1.0.4
+//   async-trait-0.1.50
+//   autocfg-1.0.1
+//   bitflags-1.2.1 "default"
+//   futures-0.3.14 "alloc"
+//   futures-channel-0.3.14 "alloc,futures-sink,sink"
+//   futures-core-0.3.14 "alloc"
+//   futures-io-0.3.14
+//   futures-sink-0.3.14 "alloc"
+//   futures-task-0.3.14 "alloc"
+//   futures-util-0.3.14 "alloc,futures-sink,sink"
+//   intrusive-collections-0.9.0 "alloc,default"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
+//   memoffset-0.5.6 "default"
+//   paste-1.0.5
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
-//   proc-macro-hack-0.5.19
-//   proc-macro-nested-0.1.7
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   slab-0.4.3 "default,std"
+//   smallvec-1.6.1
+//   syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
 //   unicode-xid-0.2.1 "default"
diff --git a/kvm_sys/Android.bp b/kvm_sys/Android.bp
index 8d52e7118..7724a1195 100644
--- a/kvm_sys/Android.bp
+++ b/kvm_sys/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -89,27 +90,33 @@ rust_library {
 //   ../sync/src/lib.rs
 //   ../sys_util/poll_token_derive/poll_token_derive.rs
 //   ../sys_util/src/lib.rs
-//   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
 //   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
-//   futures-0.3.13 "alloc"
-//   futures-channel-0.3.13 "alloc,futures-sink,sink"
-//   futures-core-0.3.13 "alloc"
-//   futures-io-0.3.13
-//   futures-sink-0.3.13 "alloc"
-//   futures-task-0.3.13 "alloc"
-//   futures-util-0.3.13 "alloc,futures-sink,sink"
-//   libc-0.2.87 "default,std"
-//   paste-1.0.4
+//   async-trait-0.1.50
+//   autocfg-1.0.1
+//   futures-0.3.14 "alloc"
+//   futures-channel-0.3.14 "alloc,futures-sink,sink"
+//   futures-core-0.3.14 "alloc"
+//   futures-io-0.3.14
+//   futures-sink-0.3.14 "alloc"
+//   futures-task-0.3.14 "alloc"
+//   futures-util-0.3.14 "alloc,futures-sink,sink"
+//   intrusive-collections-0.9.0 "alloc,default"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
+//   memoffset-0.5.6 "default"
+//   paste-1.0.5
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   slab-0.4.3 "default,std"
+//   smallvec-1.6.1
+//   syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
 //   unicode-xid-0.2.1 "default"
diff --git a/libcrosvm_control/Android.bp b/libcrosvm_control/Android.bp
new file mode 100644
index 000000000..fdeb88068
--- /dev/null
+++ b/libcrosvm_control/Android.bp
@@ -0,0 +1,99 @@
+// This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
+
+
+
+rust_defaults {
+    name: "libcrosvm_control_defaults",
+    defaults: ["crosvm_defaults"],
+    crate_name: "libcrosvm_control",
+    srcs: ["src/lib.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2018",
+    rustlibs: [
+        "libbase_rust",
+        "liblibc",
+        "libvm_control",
+    ],
+}
+
+rust_test_host {
+    name: "libcrosvm_control_host_test_src_lib",
+    defaults: ["libcrosvm_control_defaults"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "libcrosvm_control_device_test_src_lib",
+    defaults: ["libcrosvm_control_defaults"],
+}
+
+rust_ffi_shared {
+    name: "liblibcrosvm_control_shared",
+    defaults: ["crosvm_defaults"],
+    stem: "liblibcrosvm_control",
+    host_supported: true,
+    crate_name: "libcrosvm_control",
+    srcs: ["src/lib.rs"],
+    edition: "2018",
+    rustlibs: [
+        "libbase_rust",
+        "liblibc",
+        "libvm_control",
+    ],
+}
+
+// dependent_library ["feature_list"]
+//   ../assertions/src/lib.rs
+//   ../base/src/lib.rs
+//   ../bit_field/bit_field_derive/bit_field_derive.rs
+//   ../bit_field/src/lib.rs
+//   ../cros_async/src/lib.rs
+//   ../data_model/src/lib.rs
+//   ../enumn/src/lib.rs
+//   ../hypervisor/src/lib.rs
+//   ../io_uring/src/lib.rs
+//   ../kvm/src/lib.rs
+//   ../kvm_sys/src/lib.rs
+//   ../resources/src/lib.rs
+//   ../rutabaga_gfx/src/lib.rs
+//   ../sync/src/lib.rs
+//   ../sys_util/poll_token_derive/poll_token_derive.rs
+//   ../sys_util/src/lib.rs
+//   ../tempfile/src/lib.rs
+//   ../vm_control/src/lib.rs
+//   ../vm_memory/src/lib.rs
+//   async-task-4.0.3 "default,std"
+//   async-trait-0.1.50
+//   autocfg-1.0.1
+//   bitflags-1.2.1 "default"
+//   downcast-rs-1.2.0 "default,std"
+//   futures-0.3.14 "alloc"
+//   futures-channel-0.3.14 "alloc,futures-sink,sink"
+//   futures-core-0.3.14 "alloc"
+//   futures-io-0.3.14
+//   futures-sink-0.3.14 "alloc"
+//   futures-task-0.3.14 "alloc"
+//   futures-util-0.3.14 "alloc,futures-sink,sink"
+//   intrusive-collections-0.9.0 "alloc,default"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
+//   memoffset-0.5.6 "default"
+//   paste-1.0.5
+//   pin-project-lite-0.2.6
+//   pin-utils-0.1.0
+//   proc-macro2-1.0.26 "default,proc-macro"
+//   quote-1.0.9 "default,proc-macro"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   slab-0.4.3 "default,std"
+//   smallvec-1.6.1
+//   syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   thiserror-1.0.24
+//   thiserror-impl-1.0.24
+//   unicode-xid-0.2.1 "default"
diff --git a/linux_input_sys/Android.bp b/linux_input_sys/Android.bp
index a4eab2ebc..033d5c36f 100644
--- a/linux_input_sys/Android.bp
+++ b/linux_input_sys/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -60,27 +61,33 @@ rust_test {
 //   ../sync/src/lib.rs
 //   ../sys_util/poll_token_derive/poll_token_derive.rs
 //   ../sys_util/src/lib.rs
-//   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
 //   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
-//   futures-0.3.13 "alloc"
-//   futures-channel-0.3.13 "alloc,futures-sink,sink"
-//   futures-core-0.3.13 "alloc"
-//   futures-io-0.3.13
-//   futures-sink-0.3.13 "alloc"
-//   futures-task-0.3.13 "alloc"
-//   futures-util-0.3.13 "alloc,futures-sink,sink"
-//   libc-0.2.87 "default,std"
-//   paste-1.0.4
+//   async-trait-0.1.50
+//   autocfg-1.0.1
+//   futures-0.3.14 "alloc"
+//   futures-channel-0.3.14 "alloc,futures-sink,sink"
+//   futures-core-0.3.14 "alloc"
+//   futures-io-0.3.14
+//   futures-sink-0.3.14 "alloc"
+//   futures-task-0.3.14 "alloc"
+//   futures-util-0.3.14 "alloc,futures-sink,sink"
+//   intrusive-collections-0.9.0 "alloc,default"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
+//   memoffset-0.5.6 "default"
+//   paste-1.0.5
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   slab-0.4.3 "default,std"
+//   smallvec-1.6.1
+//   syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
 //   unicode-xid-0.2.1 "default"
diff --git a/msg_socket/Android.bp b/msg_socket/Android.bp
deleted file mode 100644
index 45d74f245..000000000
--- a/msg_socket/Android.bp
+++ /dev/null
@@ -1,179 +0,0 @@
-// This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace --no-subdir.
-
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_crosvm_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-BSD
-    default_applicable_licenses: ["external_crosvm_license"],
-}
-
-rust_library {
-    name: "libmsg_socket",
-    defaults: ["crosvm_defaults"],
-    host_supported: true,
-    crate_name: "msg_socket",
-    srcs: ["src/lib.rs"],
-    edition: "2018",
-    rustlibs: [
-        "libbase_rust",
-        "libcros_async",
-        "libdata_model",
-        "libfutures",
-        "liblibc",
-        "libsync_rust",
-    ],
-    proc_macros: ["libmsg_on_socket_derive"],
-}
-
-rust_defaults {
-    name: "msg_socket_defaults",
-    defaults: ["crosvm_defaults"],
-    crate_name: "msg_socket",
-    srcs: ["src/lib.rs"],
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2018",
-    rustlibs: [
-        "libbase_rust",
-        "libcros_async",
-        "libdata_model",
-        "libfutures",
-        "liblibc",
-        "libsync_rust",
-    ],
-    proc_macros: ["libmsg_on_socket_derive"],
-}
-
-rust_test_host {
-    name: "msg_socket_host_test_src_lib",
-    defaults: ["msg_socket_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "msg_socket_device_test_src_lib",
-    defaults: ["msg_socket_defaults"],
-}
-
-rust_defaults {
-    name: "msg_socket_defaults_msg_socket",
-    defaults: ["crosvm_defaults"],
-    crate_name: "msg_socket",
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2018",
-    rustlibs: [
-        "libbase_rust",
-        "libcros_async",
-        "libdata_model",
-        "libfutures",
-        "liblibc",
-        "libmsg_socket",
-        "libsync_rust",
-    ],
-    proc_macros: ["libmsg_on_socket_derive"],
-}
-
-rust_test_host {
-    name: "msg_socket_host_test_tests_enum",
-    defaults: ["msg_socket_defaults_msg_socket"],
-    srcs: ["tests/enum.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "msg_socket_device_test_tests_enum",
-    defaults: ["msg_socket_defaults_msg_socket"],
-    srcs: ["tests/enum.rs"],
-}
-
-rust_test_host {
-    name: "msg_socket_host_test_tests_struct",
-    defaults: ["msg_socket_defaults_msg_socket"],
-    srcs: ["tests/struct.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "msg_socket_device_test_tests_struct",
-    defaults: ["msg_socket_defaults_msg_socket"],
-    srcs: ["tests/struct.rs"],
-}
-
-rust_test_host {
-    name: "msg_socket_host_test_tests_tuple",
-    defaults: ["msg_socket_defaults_msg_socket"],
-    srcs: ["tests/tuple.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "msg_socket_device_test_tests_tuple",
-    defaults: ["msg_socket_defaults_msg_socket"],
-    srcs: ["tests/tuple.rs"],
-}
-
-rust_test_host {
-    name: "msg_socket_host_test_tests_unit",
-    defaults: ["msg_socket_defaults_msg_socket"],
-    srcs: ["tests/unit.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "msg_socket_device_test_tests_unit",
-    defaults: ["msg_socket_defaults_msg_socket"],
-    srcs: ["tests/unit.rs"],
-}
-
-// dependent_library ["feature_list"]
-//   ../assertions/src/lib.rs
-//   ../base/src/lib.rs
-//   ../cros_async/src/lib.rs
-//   ../data_model/src/lib.rs
-//   ../io_uring/src/lib.rs
-//   ../sync/src/lib.rs
-//   ../sys_util/poll_token_derive/poll_token_derive.rs
-//   ../sys_util/src/lib.rs
-//   ../syscall_defines/src/lib.rs
-//   ../tempfile/src/lib.rs
-//   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
-//   base-0.1.0
-//   futures-0.3.13 "alloc,async-await,default,executor,futures-executor,std"
-//   futures-channel-0.3.13 "alloc,futures-sink,sink,std"
-//   futures-core-0.3.13 "alloc,std"
-//   futures-executor-0.3.13 "std"
-//   futures-io-0.3.13 "std"
-//   futures-macro-0.3.13
-//   futures-sink-0.3.13 "alloc,std"
-//   futures-task-0.3.13 "alloc,std"
-//   futures-util-0.3.13 "alloc,async-await,async-await-macro,channel,futures-channel,futures-io,futures-macro,futures-sink,io,memchr,proc-macro-hack,proc-macro-nested,sink,slab,std"
-//   libc-0.2.87 "default,std"
-//   memchr-2.3.4 "default,std"
-//   paste-1.0.4
-//   pin-project-lite-0.2.6
-//   pin-utils-0.1.0
-//   proc-macro-hack-0.5.19
-//   proc-macro-nested-0.1.7
-//   proc-macro2-1.0.24 "default,proc-macro"
-//   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
-//   thiserror-1.0.24
-//   thiserror-impl-1.0.24
-//   unicode-xid-0.2.1 "default"
diff --git a/msg_socket/msg_on_socket_derive/Android.bp b/msg_socket/msg_on_socket_derive/Android.bp
deleted file mode 100644
index d41acb1fe..000000000
--- a/msg_socket/msg_on_socket_derive/Android.bp
+++ /dev/null
@@ -1,45 +0,0 @@
-// This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
-
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_crosvm_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-BSD
-    default_applicable_licenses: ["external_crosvm_license"],
-}
-
-rust_proc_macro {
-    name: "libmsg_on_socket_derive",
-    defaults: ["crosvm_proc_macro_defaults"],
-    crate_name: "msg_on_socket_derive",
-    srcs: ["msg_on_socket_derive.rs"],
-    edition: "2018",
-    rustlibs: [
-        "libproc_macro2",
-        "libquote",
-        "libsyn",
-    ],
-}
-
-rust_test_host {
-    name: "msg_on_socket_derive_host_test_msg_on_socket_derive",
-    defaults: ["crosvm_defaults"],
-    crate_name: "msg_on_socket_derive",
-    srcs: ["msg_on_socket_derive.rs"],
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2018",
-    rustlibs: [
-        "libproc_macro2",
-        "libquote",
-        "libsyn",
-    ],
-}
-
-// dependent_library ["feature_list"]
-//   base-0.1.0
-//   proc-macro2-1.0.24 "default,proc-macro"
-//   quote-1.0.9 "default,proc-macro"
-//   syn-1.0.61 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
-//   unicode-xid-0.2.1 "default"
diff --git a/net_sys/Android.bp b/net_sys/Android.bp
index 62a69983c..1adaed067 100644
--- a/net_sys/Android.bp
+++ b/net_sys/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -56,27 +57,33 @@ rust_test {
 //   ../sync/src/lib.rs
 //   ../sys_util/poll_token_derive/poll_token_derive.rs
 //   ../sys_util/src/lib.rs
-//   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
 //   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
-//   futures-0.3.13 "alloc"
-//   futures-channel-0.3.13 "alloc,futures-sink,sink"
-//   futures-core-0.3.13 "alloc"
-//   futures-io-0.3.13
-//   futures-sink-0.3.13 "alloc"
-//   futures-task-0.3.13 "alloc"
-//   futures-util-0.3.13 "alloc,futures-sink,sink"
-//   libc-0.2.87 "default,std"
-//   paste-1.0.4
+//   async-trait-0.1.50
+//   autocfg-1.0.1
+//   futures-0.3.14 "alloc"
+//   futures-channel-0.3.14 "alloc,futures-sink,sink"
+//   futures-core-0.3.14 "alloc"
+//   futures-io-0.3.14
+//   futures-sink-0.3.14 "alloc"
+//   futures-task-0.3.14 "alloc"
+//   futures-util-0.3.14 "alloc,futures-sink,sink"
+//   intrusive-collections-0.9.0 "alloc,default"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
+//   memoffset-0.5.6 "default"
+//   paste-1.0.5
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   slab-0.4.3 "default,std"
+//   smallvec-1.6.1
+//   syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
 //   unicode-xid-0.2.1 "default"
diff --git a/net_util/Android.bp b/net_util/Android.bp
index d026baa29..ba0dca600 100644
--- a/net_util/Android.bp
+++ b/net_util/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -63,27 +64,33 @@ rust_test {
 //   ../sync/src/lib.rs
 //   ../sys_util/poll_token_derive/poll_token_derive.rs
 //   ../sys_util/src/lib.rs
-//   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
 //   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
-//   futures-0.3.13 "alloc"
-//   futures-channel-0.3.13 "alloc,futures-sink,sink"
-//   futures-core-0.3.13 "alloc"
-//   futures-io-0.3.13
-//   futures-sink-0.3.13 "alloc"
-//   futures-task-0.3.13 "alloc"
-//   futures-util-0.3.13 "alloc,futures-sink,sink"
-//   libc-0.2.87 "default,std"
-//   paste-1.0.4
+//   async-trait-0.1.50
+//   autocfg-1.0.1
+//   futures-0.3.14 "alloc"
+//   futures-channel-0.3.14 "alloc,futures-sink,sink"
+//   futures-core-0.3.14 "alloc"
+//   futures-io-0.3.14
+//   futures-sink-0.3.14 "alloc"
+//   futures-task-0.3.14 "alloc"
+//   futures-util-0.3.14 "alloc,futures-sink,sink"
+//   intrusive-collections-0.9.0 "alloc,default"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
+//   memoffset-0.5.6 "default"
+//   paste-1.0.5
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   slab-0.4.3 "default,std"
+//   smallvec-1.6.1
+//   syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
 //   unicode-xid-0.2.1 "default"
diff --git a/power_monitor/Android.bp b/power_monitor/Android.bp
index 57e13d22b..681d872e4 100644
--- a/power_monitor/Android.bp
+++ b/power_monitor/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -56,27 +57,33 @@ rust_test {
 //   ../sync/src/lib.rs
 //   ../sys_util/poll_token_derive/poll_token_derive.rs
 //   ../sys_util/src/lib.rs
-//   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
 //   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
-//   futures-0.3.13 "alloc"
-//   futures-channel-0.3.13 "alloc,futures-sink,sink"
-//   futures-core-0.3.13 "alloc"
-//   futures-io-0.3.13
-//   futures-sink-0.3.13 "alloc"
-//   futures-task-0.3.13 "alloc"
-//   futures-util-0.3.13 "alloc,futures-sink,sink"
-//   libc-0.2.87 "default,std"
-//   paste-1.0.4
+//   async-trait-0.1.50
+//   autocfg-1.0.1
+//   futures-0.3.14 "alloc"
+//   futures-channel-0.3.14 "alloc,futures-sink,sink"
+//   futures-core-0.3.14 "alloc"
+//   futures-io-0.3.14
+//   futures-sink-0.3.14 "alloc"
+//   futures-task-0.3.14 "alloc"
+//   futures-util-0.3.14 "alloc,futures-sink,sink"
+//   intrusive-collections-0.9.0 "alloc,default"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
+//   memoffset-0.5.6 "default"
+//   paste-1.0.5
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   slab-0.4.3 "default,std"
+//   smallvec-1.6.1
+//   syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
 //   unicode-xid-0.2.1 "default"
diff --git a/protos/Android.bp b/protos/Android.bp
index a1d951425..ca1aa7288 100644
--- a/protos/Android.bp
+++ b/protos/Android.bp
@@ -14,12 +14,11 @@ rust_library {
     // has rustc warnings
     host_supported: true,
     crate_name: "protos",
-    srcs: [
-        "src/lib.rs",
-    ],
+    srcs: ["src/lib.rs"],
     features: [
         "composite-disk",
     ],
+        edition: "2018",
     rustlibs: [
         "libprotobuf",
         "libcdisk_spec_proto",
@@ -45,3 +44,21 @@ rust_protobuf {
     source_stem: "plugin",
     host_supported: true,
 }
+
+// dependent_library ["feature_list"]
+//   cfg-if-1.0.0
+//   either-1.6.1 "default,use_std"
+//   getrandom-0.2.2 "std"
+//   libc-0.2.93 "default,std"
+//   log-0.4.14
+//   ppv-lite86-0.2.10 "simd,std"
+//   protobuf-2.22.1
+//   protobuf-codegen-2.22.1
+//   protoc-2.22.1
+//   protoc-rust-2.22.1
+//   rand-0.8.3 "alloc,default,getrandom,libc,rand_chacha,rand_hc,std,std_rng"
+//   rand_chacha-0.3.0 "std"
+//   rand_core-0.6.2 "alloc,getrandom,std"
+//   remove_dir_all-0.5.3
+//   tempfile-3.2.0
+//   which-4.1.0
diff --git a/qcow_utils/Android.bp b/qcow_utils/Android.bp
index 01b5505e9..f8d68d31d 100644
--- a/qcow_utils/Android.bp
+++ b/qcow_utils/Android.bp
@@ -1,3 +1,4 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 // Feature is disabled for Android
diff --git a/rand_ish/Android.bp b/rand_ish/Android.bp
index ecc019d80..aa1fd9733 100644
--- a/rand_ish/Android.bp
+++ b/rand_ish/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
diff --git a/resources/Android.bp b/resources/Android.bp
index 1850c52ef..5bb5b5cb7 100644
--- a/resources/Android.bp
+++ b/resources/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -19,7 +20,7 @@ rust_library {
     rustlibs: [
         "libbase_rust",
         "liblibc",
-        "libmsg_socket",
+        "libserde",
     ],
 }
 
@@ -34,7 +35,7 @@ rust_defaults {
     rustlibs: [
         "libbase_rust",
         "liblibc",
-        "libmsg_socket",
+        "libserde",
     ],
 }
 
@@ -57,38 +58,36 @@ rust_test {
 //   ../cros_async/src/lib.rs
 //   ../data_model/src/lib.rs
 //   ../io_uring/src/lib.rs
-//   ../msg_socket/msg_on_socket_derive/msg_on_socket_derive.rs
-//   ../msg_socket/src/lib.rs
 //   ../sync/src/lib.rs
 //   ../sys_util/poll_token_derive/poll_token_derive.rs
 //   ../sys_util/src/lib.rs
-//   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
 //   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
-//   base-0.1.0
-//   futures-0.3.13 "alloc,async-await,default,executor,futures-executor,std"
-//   futures-channel-0.3.13 "alloc,futures-sink,sink,std"
-//   futures-core-0.3.13 "alloc,std"
-//   futures-executor-0.3.13 "std"
-//   futures-io-0.3.13 "std"
-//   futures-macro-0.3.13
-//   futures-sink-0.3.13 "alloc,std"
-//   futures-task-0.3.13 "alloc,std"
-//   futures-util-0.3.13 "alloc,async-await,async-await-macro,channel,futures-channel,futures-io,futures-macro,futures-sink,io,memchr,proc-macro-hack,proc-macro-nested,sink,slab,std"
-//   libc-0.2.87 "default,std"
-//   memchr-2.3.4 "default,std"
-//   paste-1.0.4
+//   async-trait-0.1.50
+//   autocfg-1.0.1
+//   futures-0.3.14 "alloc"
+//   futures-channel-0.3.14 "alloc,futures-sink,sink"
+//   futures-core-0.3.14 "alloc"
+//   futures-io-0.3.14
+//   futures-sink-0.3.14 "alloc"
+//   futures-task-0.3.14 "alloc"
+//   futures-util-0.3.14 "alloc,futures-sink,sink"
+//   intrusive-collections-0.9.0 "alloc,default"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
+//   memoffset-0.5.6 "default"
+//   paste-1.0.5
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
-//   proc-macro-hack-0.5.19
-//   proc-macro-nested-0.1.7
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   slab-0.4.3 "default,std"
+//   smallvec-1.6.1
+//   syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
 //   unicode-xid-0.2.1 "default"
diff --git a/rutabaga_gfx/Android.bp b/rutabaga_gfx/Android.bp
index 328a0e60e..e356ff64c 100644
--- a/rutabaga_gfx/Android.bp
+++ b/rutabaga_gfx/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --device --test --global_defaults=crosvm_defaults --dependencies --add_workspace --features=gfxstream,virgl_renderer,virgl_renderer_next.
+// This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -9,14 +10,12 @@ package {
     default_applicable_licenses: ["external_crosvm_license"],
 }
 
-rust_defaults {
-    name: "rutabaga_gfx_defaults",
+rust_library {
+    name: "librutabaga_gfx",
     defaults: ["crosvm_defaults"],
+    host_supported: true,
     crate_name: "rutabaga_gfx",
-    // has rustc warnings
     srcs: ["src/lib.rs"],
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
     edition: "2018",
     features: [
         "gfxstream",
@@ -38,8 +37,8 @@ rust_defaults {
         },
         android: {
             shared_libs: [
-	        "libdrm",
-	    ],
+            "libdrm",
+        ],
             static_libs: [
                 "libepoxy",
                 "libgbm",
@@ -49,25 +48,14 @@ rust_defaults {
     },
 }
 
-rust_test_host {
-    name: "rutabaga_gfx_host_test_src_lib",
-    defaults: ["rutabaga_gfx_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "rutabaga_gfx_device_test_src_lib",
-    defaults: ["rutabaga_gfx_defaults"],
-}
-
-rust_library {
-    name: "librutabaga_gfx",
+rust_defaults {
+    name: "rutabaga_gfx_defaults",
     defaults: ["crosvm_defaults"],
-    host_supported: true,
     crate_name: "rutabaga_gfx",
+    // has rustc warnings
     srcs: ["src/lib.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     edition: "2018",
     features: [
         "gfxstream",
@@ -89,8 +77,8 @@ rust_library {
         },
         android: {
             shared_libs: [
-	        "libdrm",
-	    ],
+            "libdrm",
+        ],
             static_libs: [
                 "libepoxy",
                 "libgbm",
@@ -100,6 +88,19 @@ rust_library {
     },
 }
 
+rust_test_host {
+    name: "rutabaga_gfx_host_test_src_lib",
+    defaults: ["rutabaga_gfx_defaults"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "rutabaga_gfx_device_test_src_lib",
+    defaults: ["rutabaga_gfx_defaults"],
+}
+
 // dependent_library ["feature_list"]
 //   ../assertions/src/lib.rs
 //   ../base/src/lib.rs
@@ -109,27 +110,33 @@ rust_library {
 //   ../sync/src/lib.rs
 //   ../sys_util/poll_token_derive/poll_token_derive.rs
 //   ../sys_util/src/lib.rs
-//   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
 //   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
-//   futures-0.3.13 "alloc"
-//   futures-channel-0.3.13 "alloc,futures-sink,sink"
-//   futures-core-0.3.13 "alloc"
-//   futures-io-0.3.13
-//   futures-sink-0.3.13 "alloc"
-//   futures-task-0.3.13 "alloc"
-//   futures-util-0.3.13 "alloc,futures-sink,sink"
-//   libc-0.2.87 "default,std"
-//   paste-1.0.4
+//   async-trait-0.1.50
+//   autocfg-1.0.1
+//   futures-0.3.14 "alloc"
+//   futures-channel-0.3.14 "alloc,futures-sink,sink"
+//   futures-core-0.3.14 "alloc"
+//   futures-io-0.3.14
+//   futures-sink-0.3.14 "alloc"
+//   futures-task-0.3.14 "alloc"
+//   futures-util-0.3.14 "alloc,futures-sink,sink"
+//   intrusive-collections-0.9.0 "alloc,default"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
+//   memoffset-0.5.6 "default"
+//   paste-1.0.5
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   slab-0.4.3 "default,std"
+//   smallvec-1.6.1
+//   syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
 //   unicode-xid-0.2.1 "default"
diff --git a/sync/Android.bp b/sync/Android.bp
index 67c94b7dc..176f78e18 100644
--- a/sync/Android.bp
+++ b/sync/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
diff --git a/sys_util/Android.bp b/sys_util/Android.bp
index 36b9c1374..0572fd2cd 100644
--- a/sys_util/Android.bp
+++ b/sys_util/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace --no-subdir.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -19,8 +20,9 @@ rust_library {
     rustlibs: [
         "libdata_model",
         "liblibc",
+        "libserde",
+        "libserde_json",
         "libsync_rust",
-        "libsyscall_defines",
         "libtempfile",
     ],
     proc_macros: ["libpoll_token_derive"],
@@ -58,21 +60,24 @@ rust_defaults {
     rustlibs: [
         "libdata_model",
         "liblibc",
+        "libserde",
+        "libserde_json",
         "libsync_rust",
-        "libsyscall_defines",
         "libtempfile",
     ],
     proc_macros: ["libpoll_token_derive"],
     shared_libs: ["libcap"],  // specified in src/capabilities.rs
 }
 
-rust_test_host {
-    name: "sys_util_host_test_src_lib",
-    defaults: ["sys_util_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
+// TODO: This doesn't link because of missing getrandom in Bionic (host only, it's
+// available in the guest). Fix it upstream.
+// rust_test_host {
+//     name: "sys_util_host_test_src_lib",
+//     defaults: ["sys_util_defaults"],
+//     test_options: {
+//         unit_test: true,
+//     },
+// }
 
 // TODO: This doesn't build due to missing shm_open &c. in Bionic. Fix it upstream.
 //rust_test {
@@ -87,12 +92,14 @@ rust_test_host {
 //   ../assertions/src/lib.rs
 //   ../data_model/src/lib.rs
 //   ../sync/src/lib.rs
-//   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
-//   libc-0.2.87 "default,std"
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   syn-1.0.61 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   syn-1.0.70 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
 //   unicode-xid-0.2.1 "default"
diff --git a/sys_util/poll_token_derive/Android.bp b/sys_util/poll_token_derive/Android.bp
index 0d0edab76..3023e24a5 100644
--- a/sys_util/poll_token_derive/Android.bp
+++ b/sys_util/poll_token_derive/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -38,7 +39,7 @@ rust_test_host {
 }
 
 // dependent_library ["feature_list"]
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   syn-1.0.61 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
+//   syn-1.0.70 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
 //   unicode-xid-0.2.1 "default"
diff --git a/syscall_defines/Android.bp b/syscall_defines/Android.bp
index 3837f5006..f66fe441e 100644
--- a/syscall_defines/Android.bp
+++ b/syscall_defines/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
diff --git a/tempfile/Android.bp b/tempfile/Android.bp
index c1ff045e3..125d00ac8 100644
--- a/tempfile/Android.bp
+++ b/tempfile/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -48,4 +49,4 @@ rust_test {
 }
 
 // dependent_library ["feature_list"]
-//   libc-0.2.87 "default,std"
+//   libc-0.2.93 "default,std"
diff --git a/tpm2-sys/Android.bp b/tpm2-sys/Android.bp
index 01b5505e9..f8d68d31d 100644
--- a/tpm2-sys/Android.bp
+++ b/tpm2-sys/Android.bp
@@ -1,3 +1,4 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 // Feature is disabled for Android
diff --git a/tpm2/Android.bp b/tpm2/Android.bp
index 01b5505e9..f8d68d31d 100644
--- a/tpm2/Android.bp
+++ b/tpm2/Android.bp
@@ -1,3 +1,4 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 // Feature is disabled for Android
diff --git a/usb_sys/Android.bp b/usb_sys/Android.bp
index 777802d7c..a9c980029 100644
--- a/usb_sys/Android.bp
+++ b/usb_sys/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -56,27 +57,33 @@ rust_test {
 //   ../sync/src/lib.rs
 //   ../sys_util/poll_token_derive/poll_token_derive.rs
 //   ../sys_util/src/lib.rs
-//   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
 //   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
-//   futures-0.3.13 "alloc"
-//   futures-channel-0.3.13 "alloc,futures-sink,sink"
-//   futures-core-0.3.13 "alloc"
-//   futures-io-0.3.13
-//   futures-sink-0.3.13 "alloc"
-//   futures-task-0.3.13 "alloc"
-//   futures-util-0.3.13 "alloc,futures-sink,sink"
-//   libc-0.2.87 "default,std"
-//   paste-1.0.4
+//   async-trait-0.1.50
+//   autocfg-1.0.1
+//   futures-0.3.14 "alloc"
+//   futures-channel-0.3.14 "alloc,futures-sink,sink"
+//   futures-core-0.3.14 "alloc"
+//   futures-io-0.3.14
+//   futures-sink-0.3.14 "alloc"
+//   futures-task-0.3.14 "alloc"
+//   futures-util-0.3.14 "alloc,futures-sink,sink"
+//   intrusive-collections-0.9.0 "alloc,default"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
+//   memoffset-0.5.6 "default"
+//   paste-1.0.5
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   slab-0.4.3 "default,std"
+//   smallvec-1.6.1
+//   syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
 //   unicode-xid-0.2.1 "default"
diff --git a/usb_util/Android.bp b/usb_util/Android.bp
index badabda88..98ec8fa20 100644
--- a/usb_util/Android.bp
+++ b/usb_util/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -66,29 +67,35 @@ rust_test {
 //   ../sync/src/lib.rs
 //   ../sys_util/poll_token_derive/poll_token_derive.rs
 //   ../sys_util/src/lib.rs
-//   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
 //   ../usb_sys/src/lib.rs
 //   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
-//   futures-0.3.13 "alloc"
-//   futures-channel-0.3.13 "alloc,futures-sink,sink"
-//   futures-core-0.3.13 "alloc"
-//   futures-io-0.3.13
-//   futures-sink-0.3.13 "alloc"
-//   futures-task-0.3.13 "alloc"
-//   futures-util-0.3.13 "alloc,futures-sink,sink"
-//   libc-0.2.87 "default,std"
-//   paste-1.0.4
+//   async-trait-0.1.50
+//   autocfg-1.0.1
+//   futures-0.3.14 "alloc"
+//   futures-channel-0.3.14 "alloc,futures-sink,sink"
+//   futures-core-0.3.14 "alloc"
+//   futures-io-0.3.14
+//   futures-sink-0.3.14 "alloc"
+//   futures-task-0.3.14 "alloc"
+//   futures-util-0.3.14 "alloc,futures-sink,sink"
+//   intrusive-collections-0.9.0 "alloc,default"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
+//   memoffset-0.5.6 "default"
+//   paste-1.0.5
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
 //   remain-0.2.2
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   slab-0.4.3 "default,std"
+//   smallvec-1.6.1
+//   syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
 //   unicode-xid-0.2.1 "default"
diff --git a/vfio_sys/Android.bp b/vfio_sys/Android.bp
index 169d94dee..faead377f 100644
--- a/vfio_sys/Android.bp
+++ b/vfio_sys/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -56,27 +57,33 @@ rust_test {
 //   ../sync/src/lib.rs
 //   ../sys_util/poll_token_derive/poll_token_derive.rs
 //   ../sys_util/src/lib.rs
-//   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
 //   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
-//   futures-0.3.13 "alloc"
-//   futures-channel-0.3.13 "alloc,futures-sink,sink"
-//   futures-core-0.3.13 "alloc"
-//   futures-io-0.3.13
-//   futures-sink-0.3.13 "alloc"
-//   futures-task-0.3.13 "alloc"
-//   futures-util-0.3.13 "alloc,futures-sink,sink"
-//   libc-0.2.87 "default,std"
-//   paste-1.0.4
+//   async-trait-0.1.50
+//   autocfg-1.0.1
+//   futures-0.3.14 "alloc"
+//   futures-channel-0.3.14 "alloc,futures-sink,sink"
+//   futures-core-0.3.14 "alloc"
+//   futures-io-0.3.14
+//   futures-sink-0.3.14 "alloc"
+//   futures-task-0.3.14 "alloc"
+//   futures-util-0.3.14 "alloc,futures-sink,sink"
+//   intrusive-collections-0.9.0 "alloc,default"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
+//   memoffset-0.5.6 "default"
+//   paste-1.0.5
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   slab-0.4.3 "default,std"
+//   smallvec-1.6.1
+//   syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
 //   unicode-xid-0.2.1 "default"
diff --git a/vhost/Android.bp b/vhost/Android.bp
index cccca65dd..cc6c6a32c 100644
--- a/vhost/Android.bp
+++ b/vhost/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -68,29 +69,36 @@ rust_test {
 //   ../sync/src/lib.rs
 //   ../sys_util/poll_token_derive/poll_token_derive.rs
 //   ../sys_util/src/lib.rs
-//   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
 //   ../virtio_sys/src/lib.rs
 //   ../vm_memory/src/lib.rs
 //   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
-//   futures-0.3.13 "alloc"
-//   futures-channel-0.3.13 "alloc,futures-sink,sink"
-//   futures-core-0.3.13 "alloc"
-//   futures-io-0.3.13
-//   futures-sink-0.3.13 "alloc"
-//   futures-task-0.3.13 "alloc"
-//   futures-util-0.3.13 "alloc,futures-sink,sink"
-//   libc-0.2.87 "default,std"
-//   paste-1.0.4
+//   async-trait-0.1.50
+//   autocfg-1.0.1
+//   bitflags-1.2.1 "default"
+//   futures-0.3.14 "alloc"
+//   futures-channel-0.3.14 "alloc,futures-sink,sink"
+//   futures-core-0.3.14 "alloc"
+//   futures-io-0.3.14
+//   futures-sink-0.3.14 "alloc"
+//   futures-task-0.3.14 "alloc"
+//   futures-util-0.3.14 "alloc,futures-sink,sink"
+//   intrusive-collections-0.9.0 "alloc,default"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
+//   memoffset-0.5.6 "default"
+//   paste-1.0.5
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   slab-0.4.3 "default,std"
+//   smallvec-1.6.1
+//   syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
 //   unicode-xid-0.2.1 "default"
diff --git a/virtio_sys/Android.bp b/virtio_sys/Android.bp
index 9e34a119a..fa7583489 100644
--- a/virtio_sys/Android.bp
+++ b/virtio_sys/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -56,27 +57,33 @@ rust_test {
 //   ../sync/src/lib.rs
 //   ../sys_util/poll_token_derive/poll_token_derive.rs
 //   ../sys_util/src/lib.rs
-//   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
 //   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
-//   futures-0.3.13 "alloc"
-//   futures-channel-0.3.13 "alloc,futures-sink,sink"
-//   futures-core-0.3.13 "alloc"
-//   futures-io-0.3.13
-//   futures-sink-0.3.13 "alloc"
-//   futures-task-0.3.13 "alloc"
-//   futures-util-0.3.13 "alloc,futures-sink,sink"
-//   libc-0.2.87 "default,std"
-//   paste-1.0.4
+//   async-trait-0.1.50
+//   autocfg-1.0.1
+//   futures-0.3.14 "alloc"
+//   futures-channel-0.3.14 "alloc,futures-sink,sink"
+//   futures-core-0.3.14 "alloc"
+//   futures-io-0.3.14
+//   futures-sink-0.3.14 "alloc"
+//   futures-task-0.3.14 "alloc"
+//   futures-util-0.3.14 "alloc,futures-sink,sink"
+//   intrusive-collections-0.9.0 "alloc,default"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
+//   memoffset-0.5.6 "default"
+//   paste-1.0.5
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   slab-0.4.3 "default,std"
+//   smallvec-1.6.1
+//   syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
 //   unicode-xid-0.2.1 "default"
diff --git a/vm_control/Android.bp b/vm_control/Android.bp
index 18325c0b3..623f43c2a 100644
--- a/vm_control/Android.bp
+++ b/vm_control/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// NOTE: The --features=gdb should be applied only to the host (not the device) and there are inline changes to achieve this
 
 package {
     // See: http://go/android-license-faq
@@ -16,14 +17,25 @@ rust_library {
     crate_name: "vm_control",
     srcs: ["src/lib.rs"],
     edition: "2018",
+    target: {
+        linux_glibc_x86_64: {
+            features: [
+                "gdb",
+                "gdbstub",
+            ],
+            rustlibs: [
+                "libgdbstub",
+            ],
+        },
+    },
     rustlibs: [
         "libbase_rust",
         "libdata_model",
         "libhypervisor",
         "liblibc",
-        "libmsg_socket",
         "libresources",
         "librutabaga_gfx",
+        "libserde",
         "libsync_rust",
         "libvm_memory",
     ],
@@ -37,14 +49,25 @@ rust_defaults {
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2018",
+    target: {
+        linux_glibc_x86_64: {
+            features: [
+                "gdb",
+                "gdbstub",
+            ],
+            rustlibs: [
+                "libgdbstub",
+            ],
+        },
+    },
     rustlibs: [
         "libbase_rust",
         "libdata_model",
         "libhypervisor",
         "liblibc",
-        "libmsg_socket",
         "libresources",
         "librutabaga_gfx",
+        "libserde",
         "libsync_rust",
         "libvm_memory",
     ],
@@ -53,7 +76,6 @@ rust_defaults {
 rust_test_host {
     name: "vm_control_host_test_src_lib",
     defaults: ["vm_control_defaults"],
-    shared_libs: ["libgfxstream_backend"],
     test_options: {
         unit_test: true,
     },
@@ -76,42 +98,41 @@ rust_test {
 //   ../io_uring/src/lib.rs
 //   ../kvm/src/lib.rs
 //   ../kvm_sys/src/lib.rs
-//   ../msg_socket/msg_on_socket_derive/msg_on_socket_derive.rs
-//   ../msg_socket/src/lib.rs
 //   ../resources/src/lib.rs
 //   ../rutabaga_gfx/src/lib.rs
 //   ../sync/src/lib.rs
 //   ../sys_util/poll_token_derive/poll_token_derive.rs
 //   ../sys_util/src/lib.rs
-//   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
 //   ../vm_memory/src/lib.rs
 //   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
-//   base-0.1.0
+//   async-trait-0.1.50
+//   autocfg-1.0.1
+//   bitflags-1.2.1 "default"
 //   downcast-rs-1.2.0 "default,std"
-//   futures-0.3.13 "alloc,async-await,default,executor,futures-executor,std"
-//   futures-channel-0.3.13 "alloc,futures-sink,sink,std"
-//   futures-core-0.3.13 "alloc,std"
-//   futures-executor-0.3.13 "std"
-//   futures-io-0.3.13 "std"
-//   futures-macro-0.3.13
-//   futures-sink-0.3.13 "alloc,std"
-//   futures-task-0.3.13 "alloc,std"
-//   futures-util-0.3.13 "alloc,async-await,async-await-macro,channel,futures-channel,futures-io,futures-macro,futures-sink,io,memchr,proc-macro-hack,proc-macro-nested,sink,slab,std"
-//   libc-0.2.87 "default,std"
-//   memchr-2.3.4 "default,std"
-//   paste-1.0.4
+//   futures-0.3.14 "alloc"
+//   futures-channel-0.3.14 "alloc,futures-sink,sink"
+//   futures-core-0.3.14 "alloc"
+//   futures-io-0.3.14
+//   futures-sink-0.3.14 "alloc"
+//   futures-task-0.3.14 "alloc"
+//   futures-util-0.3.14 "alloc,futures-sink,sink"
+//   intrusive-collections-0.9.0 "alloc,default"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
+//   memoffset-0.5.6 "default"
+//   paste-1.0.5
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
-//   proc-macro-hack-0.5.19
-//   proc-macro-nested-0.1.7
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   slab-0.4.3 "default,std"
+//   smallvec-1.6.1
+//   syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
 //   unicode-xid-0.2.1 "default"
diff --git a/vm_memory/Android.bp b/vm_memory/Android.bp
index 1f74fb96e..9634de9ff 100644
--- a/vm_memory/Android.bp
+++ b/vm_memory/Android.bp
@@ -1,4 +1,5 @@
 // This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     // See: http://go/android-license-faq
@@ -18,10 +19,10 @@ rust_library {
     edition: "2018",
     rustlibs: [
         "libbase_rust",
+        "libbitflags",
         "libcros_async",
         "libdata_model",
         "liblibc",
-        "libsyscall_defines",
     ],
 }
 
@@ -35,10 +36,10 @@ rust_defaults {
     edition: "2018",
     rustlibs: [
         "libbase_rust",
+        "libbitflags",
         "libcros_async",
         "libdata_model",
         "liblibc",
-        "libsyscall_defines",
     ],
 }
 
@@ -64,27 +65,34 @@ rust_test {
 //   ../sync/src/lib.rs
 //   ../sys_util/poll_token_derive/poll_token_derive.rs
 //   ../sys_util/src/lib.rs
-//   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
 //   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
-//   futures-0.3.13 "alloc"
-//   futures-channel-0.3.13 "alloc,futures-sink,sink"
-//   futures-core-0.3.13 "alloc"
-//   futures-io-0.3.13
-//   futures-sink-0.3.13 "alloc"
-//   futures-task-0.3.13 "alloc"
-//   futures-util-0.3.13 "alloc,futures-sink,sink"
-//   libc-0.2.87 "default,std"
-//   paste-1.0.4
+//   async-trait-0.1.50
+//   autocfg-1.0.1
+//   bitflags-1.2.1 "default"
+//   futures-0.3.14 "alloc"
+//   futures-channel-0.3.14 "alloc,futures-sink,sink"
+//   futures-core-0.3.14 "alloc"
+//   futures-io-0.3.14
+//   futures-sink-0.3.14 "alloc"
+//   futures-task-0.3.14 "alloc"
+//   futures-util-0.3.14 "alloc,futures-sink,sink"
+//   intrusive-collections-0.9.0 "alloc,default"
+//   itoa-0.4.7
+//   libc-0.2.93 "default,std"
+//   memoffset-0.5.6 "default"
+//   paste-1.0.5
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
-//   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   ryu-1.0.5
+//   serde-1.0.125 "default,derive,serde_derive,std"
+//   serde_derive-1.0.125 "default"
+//   serde_json-1.0.64 "default,std"
+//   slab-0.4.3 "default,std"
+//   smallvec-1.6.1
+//   syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
 //   unicode-xid-0.2.1 "default"
diff --git a/x86_64/Android.bp b/x86_64/Android.bp
index 8adb07a85..c1658ffb9 100644
--- a/x86_64/Android.bp
+++ b/x86_64/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace.
+// This file is generated by cargo2android.py --run --device --tests --dependencies --global_defaults=crosvm_defaults --add_workspace --features=gdb.
+// NOTE: The --features=gdb should be applied only to the host (not the device) and there are inline changes to achieve this
 
 package {
     // See: http://go/android-license-faq
@@ -17,6 +18,17 @@ rust_library {
     crate_name: "x86_64",
     srcs: ["src/lib.rs"],
     edition: "2018",
+    target: {
+        linux_glibc_x86_64: {
+            features: [
+                "gdb",
+                "gdbstub",
+            ],
+            rustlibs: [
+                "libgdbstub",
+            ],
+        },
+    },
     rustlibs: [
         "libacpi_tables",
         "libarch",
@@ -54,6 +66,17 @@ rust_defaults {
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2018",
+    target: {
+        linux_glibc_x86_64: {
+            features: [
+                "gdb",
+                "gdbstub",
+            ],
+            rustlibs: [
+                "libgdbstub",
+            ],
+        },
+    },
     rustlibs: [
         "libacpi_tables",
         "libarch",
@@ -66,7 +89,6 @@ rust_defaults {
         "libkernel_loader",
         "liblibc",
         "libminijail_rust",
-        "libmsg_socket",
         "libresources",
         "libsync_rust",
         "libvm_control",
@@ -107,7 +129,7 @@ rust_test {
 //   ../../vm_tools/p9/src/lib.rs
 //   ../../vm_tools/p9/wire_format_derive/wire_format_derive.rs
 //   ../acpi_tables/src/lib.rs
-//   ../arch/src/lib.rs
+//   ../arch/src/lib.rs "gdb,gdbstub"
 //   ../assertions/src/lib.rs
 //   ../base/src/lib.rs
 //   ../bit_field/bit_field_derive/bit_field_derive.rs
@@ -125,8 +147,6 @@ rust_test {
 //   ../kvm/src/lib.rs
 //   ../kvm_sys/src/lib.rs
 //   ../linux_input_sys/src/lib.rs
-//   ../msg_socket/msg_on_socket_derive/msg_on_socket_derive.rs
-//   ../msg_socket/src/lib.rs
 //   ../net_sys/src/lib.rs
 //   ../net_util/src/lib.rs
 //   ../power_monitor/src/lib.rs
@@ -146,10 +166,11 @@ rust_test {
 //   ../vm_control/src/lib.rs
 //   ../vm_memory/src/lib.rs
 //   async-task-4.0.3 "default,std"
-//   async-trait-0.1.45
+//   async-trait-0.1.48
 //   autocfg-1.0.1
 //   base-0.1.0
 //   bitflags-1.2.1 "default"
+//   cfg-if-0.1.10
 //   cfg-if-1.0.0
 //   downcast-rs-1.2.0 "default,std"
 //   futures-0.3.13 "alloc,async-await,default,executor,futures-executor,std"
@@ -161,12 +182,15 @@ rust_test {
 //   futures-sink-0.3.13 "alloc,std"
 //   futures-task-0.3.13 "alloc,std"
 //   futures-util-0.3.13 "alloc,async-await,async-await-macro,channel,futures-channel,futures-io,futures-macro,futures-sink,io,memchr,proc-macro-hack,proc-macro-nested,sink,slab,std"
+//   gdbstub-0.4.4 "alloc,default,std"
 //   getrandom-0.2.2 "std"
 //   intrusive-collections-0.9.0 "alloc,default"
-//   libc-0.2.87 "default,std"
+//   libc-0.2.88 "default,std"
 //   log-0.4.14
+//   managed-0.8.0 "alloc"
 //   memchr-2.3.4 "default,std"
 //   memoffset-0.5.6 "default"
+//   num-traits-0.2.14
 //   paste-1.0.4
 //   pin-project-lite-0.2.6
 //   pin-utils-0.1.0
@@ -182,10 +206,10 @@ rust_test {
 //   rand_core-0.6.2 "alloc,getrandom,std"
 //   remain-0.2.2
 //   remove_dir_all-0.5.3
-//   serde-1.0.123 "default,derive,serde_derive,std"
-//   serde_derive-1.0.123 "default"
+//   serde-1.0.124 "default,derive,serde_derive,std"
+//   serde_derive-1.0.124 "default"
 //   slab-0.4.2
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   syn-1.0.63 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   tempfile-3.2.0
 //   thiserror-1.0.24
 //   thiserror-impl-1.0.24
author	Jorge E. Moreira <jemoreira@google.com>	2021-04-26 22:46:30 +0000
committer	Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>	2021-04-26 22:46:30 +0000
commit	8f21e42540e06030310bd3120974bedb0c190d61 (patch)
tree	3d74ebc226e862b58864eb04911ca5d4ef79582c
parent	47df7974b1b50cd233685b7013bf4c7d73b3b9dd (diff)
parent	b36408f79c53537b851351b2022c2818388c4903 (diff)
download	crosvm-8f21e42540e06030310bd3120974bedb0c190d61.tar.gz