Merge "msgq test service: installable by atest" am: f74120b1fb am: b793e77b3d am: 2bd24fb45f

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1313073

Change-Id: I2887c1bda703a83c710cc5ee73a9200e180df1c2

tests/msgq/1.0/default/Android.bp

@@ -70,6 +70,17 @@ cc_test {
         "libbinder_ndk",
     ],
 
+    compile_multilib: "both",
+    multilib: {
+        lib32: {
+            suffix: "32",
+        },
+        lib64: {
+            suffix: "64",
+        },
+    },
+    test_suites: ["device-tests"],
+
     // Allow dlsym'ing self for statically linked passthrough implementations
     ldflags: ["-rdynamic"],
 
@@ -84,5 +95,4 @@ cc_test {
         "android.hardware.tests.msgq@1.0-impl",
         "android.fmq.test-impl",
     ],
-    test_suites: ["general-tests"],
 }