Merge "Compile BufferHubServer_test for 64-bit on a 64-bit platform"
diff --git a/services/bufferhub/tests/Android.bp b/services/bufferhub/tests/Android.bp
index 8d29923..3033e70 100644
--- a/services/bufferhub/tests/Android.bp
+++ b/services/bufferhub/tests/Android.bp
@@ -11,6 +11,7 @@
         "-Wall",
         "-Werror",
     ],
+    compile_multilib: "first",
     header_libs: [
         "libdvr_headers",
         "libnativewindow_headers",