Updated makefiles (includes java-library rules for applicable packages).

Change-Id: I178faf37dddb5149c1bdc217fa1395b2566194d7
Bug: 31221188
diff --git a/tests/msgq/1.0/Android.mk b/tests/msgq/1.0/Android.mk
index e2f29bd..ed5bf14 100644
--- a/tests/msgq/1.0/Android.mk
+++ b/tests/msgq/1.0/Android.mk
@@ -18,8 +18,8 @@
 $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
 $(GEN): PRIVATE_CUSTOM_TOOL = \
     $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-    -Lc++ -randroid.hardware:hardware/interfaces\
-    android.hardware.tests.msgq@1.0::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))
+    -Lc++ -randroid.hardware:hardware/interfaces \
+    android.hardware.tests.msgq@1.0::ITestMsgQ
 
 $(GEN): $(LOCAL_PATH)/ITestMsgQ.hal
 	$(transform-generated-source)