Snap for 4603395 from 93a6e39a2b8997574b11d9532ae3ce425c766fc3 to pi-release Change-Id: I8d41bbe92c184d70cd758a83f6ea28bcb2d3820f

diff --git a/tests/Android.mk b/tests/Android.mk
index 718a33b..36258d9 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk

@@ -22,10 +22,12 @@
 LOCAL_REQUIRED_MODULES :=                           \
     mq_test_client                                  \
     [email protected]    \
-    mq_test_client_32                               \
-    [email protected]_32 \
     hidl_test_helper
 
+LOCAL_REQUIRED_MODULES_arm64 := [email protected]_32 mq_test_client_32
+LOCAL_REQUIRED_MODULES_mips64 := [email protected]_32 mq_test_client_32
+LOCAL_REQUIRED_MODULES_x86_64 := [email protected]_32 mq_test_client_32
+
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)