diff --git a/.gitattributes b/.gitattributes
index 1010713..414596e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -34,7 +34,8 @@
 /external/rust/crates/libc trusty
 /external/rust/crates/log trusty
 /external/rust/crates/once_cell trusty
-/external/rust/crates/rust-openssl trusty
+/external/rust/crates/openssl trusty
+/external/rust/crates/openssl-macros trusty
 /external/rust/crates/pkcs1 trusty
 /external/rust/crates/pkcs8 trusty
 /external/rust/crates/proc-macro-error trusty
diff --git a/.gitmodules b/.gitmodules
index 218508f..ec201b4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -127,8 +127,11 @@
 	path = external/rust/crates/once_cell
 	url = ../../platform/external/rust/crates/once_cell
 [submodule "platform/external/rust/crates/openssl"]
-	path = external/rust/crates/rust-openssl
+	path = external/rust/crates/openssl
 	url = ../../platform/external/rust/crates/openssl
+[submodule "platform/external/rust/crates/openssl-macros"]
+	path = external/rust/crates/openssl-macros
+	url = ../../platform/external/rust/crates/openssl-macros
 [submodule "platform/external/rust/crates/pkcs1"]
 	path = external/rust/crates/pkcs1
 	url = ../../platform/external/rust/crates/pkcs1
diff --git a/.supermanifest b/.supermanifest
index 4479b70..c911cd3 100644
--- a/.supermanifest
+++ b/.supermanifest
@@ -1 +1 @@
-trusty/manifest refs/heads/master 84dd9c6c6e06f6b66eac0b8c27adad8bf086bea5
\ No newline at end of file
+trusty/manifest refs/heads/master 1cede9b63a2048684992483d42c303b711e3f349
\ No newline at end of file
diff --git a/external/linux b/external/linux
index 41d5eb8..e399cfd 160000
--- a/external/linux
+++ b/external/linux
@@ -1 +1 @@
-Subproject commit 41d5eb80e947fbe90872e0aef09ccf717acc175e
+Subproject commit e399cfde2692714203fc1afa84819394082f4078
diff --git a/external/rust/crates/openssl b/external/rust/crates/openssl
new file mode 160000
index 0000000..f930022
--- /dev/null
+++ b/external/rust/crates/openssl
@@ -0,0 +1 @@
+Subproject commit f9300222b6190cf926976252d0d87d8d9e585738
diff --git a/external/rust/crates/openssl-macros b/external/rust/crates/openssl-macros
new file mode 160000
index 0000000..57ab6eb
--- /dev/null
+++ b/external/rust/crates/openssl-macros
@@ -0,0 +1 @@
+Subproject commit 57ab6ebec26e0404165bacdb39dc1d2117173555
diff --git a/external/rust/crates/rust-openssl b/external/rust/crates/rust-openssl
deleted file mode 160000
index a129200..0000000
--- a/external/rust/crates/rust-openssl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a12920058060382d99ab4ac946563de09064e593
diff --git a/external/scudo b/external/scudo
index e7f8a4e..c2d40fa 160000
--- a/external/scudo
+++ b/external/scudo
@@ -1 +1 @@
-Subproject commit e7f8a4ebcb6e69518477120be83efdf1652d6425
+Subproject commit c2d40fa8211249ad9d9792ba991b7f9dc8ca06f0
diff --git a/prebuilts/rust b/prebuilts/rust
index e9af638..e7d0f8e 160000
--- a/prebuilts/rust
+++ b/prebuilts/rust
@@ -1 +1 @@
-Subproject commit e9af638f49b6e97d2c8932162d55442aa2a6c6be
+Subproject commit e7d0f8e8a28fdada0e5e74094def565476bb0b67