diff --git a/Android.bp b/Android.bp
index 457381d..b6a9c2f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -89,7 +89,11 @@
         fuzzer: false,
     },
     target: {
+        not_windows: {
+            header_libs: ["libc_headers"], // TODO(b/153662223): Clean this up.
+        },
         android: {
+            header_libs: ["libc_headers"], // TODO(b/153662223): Clean this up.
             cflags: [
                 "-DBORINGSSL_FIPS",
                 "-fPIC",
@@ -183,6 +187,12 @@
             cflags: [
                 "-DBORINGSSL_FIPS",
             ],
+            sanitize: {
+                // Disable address sanitizing otherwise libcrypto will not report
+                // itself as being in FIPS mode, which causes boringssl_self_test
+                // to fail.
+                address: false,
+            },
             inject_bssl_hash: true,
             static: {
                 // Disable the static version of libcrypto, as it causes
@@ -218,6 +228,9 @@
         "//bootable/recovery/updater",
         "//external/conscrypt",
         "//external/python/cpython2",
+        // Strictly, only the *static* toybox for legacy devices should have
+        // access to libcrypto_static, but we can't express that.
+        "//external/toybox",
         "//frameworks/ml/nn:__subpackages__",
         "//hardware/interfaces/confirmationui/1.0/vts/functional",
         "//hardware/interfaces/drm/1.0/vts/functional",
@@ -303,6 +316,14 @@
         darwin: {
             enabled: false,
         },
+        android: {
+            compile_multilib: "both",
+        },
+    },
+    multilib: {
+        lib32: {
+            suffix: "32",
+        },
     },
 }
 
@@ -330,6 +351,16 @@
         "src/util/fipstools/cavp/cavp_test_util.cc",
         "src/util/fipstools/cavp/cavp_tlskdf_test.cc",
     ],
+    target: {
+        android: {
+            compile_multilib: "both",
+        },
+    },
+    multilib: {
+        lib32: {
+            suffix: "32",
+        },
+    },
 
     shared_libs: [
         "libcrypto",