diff --git a/wifi/1.6/default/Android.bp b/wifi/1.6/default/Android.bp
index 0ac6412..a132dee 100644
--- a/wifi/1.6/default/Android.bp
+++ b/wifi/1.6/default/Android.bp
@@ -63,6 +63,7 @@
     name: "android.hardware.wifi@1.0-service-lib",
     defaults: ["android.hardware.wifi@1.0-service-cppflags-defaults"],
     proprietary: true,
+    compile_multilib: "first",
     cppflags: [
         "-Wall",
         "-Werror",
@@ -183,6 +184,7 @@
 cc_test {
     name: "android.hardware.wifi@1.0-service-tests",
     proprietary: true,
+    compile_multilib: "first",
     cppflags: [
         "-Wall",
         "-Werror",