Merge "Build cavp and bssl as both 32 bit and 64 bit."
diff --git a/Android.bp b/Android.bp
index e64e41b..b6a9c2f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -228,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",