diff --git a/benchmarks/msgq/1.0/Android.mk b/benchmarks/msgq/1.0/Android.mk
index 2f9acb3..0f4eff1 100644
--- a/benchmarks/msgq/1.0/Android.mk
+++ b/benchmarks/msgq/1.0/Android.mk
@@ -27,6 +27,7 @@
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
 LOCAL_SHARED_LIBRARIES := \
+  libhidl \
   libhwbinder \
   libutils \
 
diff --git a/nfc/1.0/Android.mk b/nfc/1.0/Android.mk
index 5f1c9aa..6f84927 100644
--- a/nfc/1.0/Android.mk
+++ b/nfc/1.0/Android.mk
@@ -61,6 +61,7 @@
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
 LOCAL_SHARED_LIBRARIES := \
+  libhidl \
   libhwbinder \
   libutils \
 
diff --git a/tests/bar/1.0/Android.mk b/tests/bar/1.0/Android.mk
index 4264ef0..24b498e 100644
--- a/tests/bar/1.0/Android.mk
+++ b/tests/bar/1.0/Android.mk
@@ -27,6 +27,7 @@
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
 LOCAL_SHARED_LIBRARIES := \
+  libhidl \
   libhwbinder \
   libutils \
   android.hardware.tests.foo@1.0 \
diff --git a/tests/expression/1.0/Android.mk b/tests/expression/1.0/Android.mk
index 98dc29e..fbd7458 100644
--- a/tests/expression/1.0/Android.mk
+++ b/tests/expression/1.0/Android.mk
@@ -27,6 +27,7 @@
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
 LOCAL_SHARED_LIBRARIES := \
+  libhidl \
   libhwbinder \
   libutils \
 
diff --git a/tests/foo/1.0/Android.mk b/tests/foo/1.0/Android.mk
index 2356506..e00ad09 100644
--- a/tests/foo/1.0/Android.mk
+++ b/tests/foo/1.0/Android.mk
@@ -9,23 +9,6 @@
 HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
 
 #
-# Build types.hal
-#
-GEN := $(intermediates)/android/hardware/tests/foo/1.0/types.cpp
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
-    $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-    -Lc++ -randroid.hardware:hardware/interfaces\
-    android.hardware.tests.foo@1.0::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))
-
-$(GEN): $(LOCAL_PATH)/types.hal
-	$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
 # Build IFooCallback.hal
 #
 GEN := $(intermediates)/android/hardware/tests/foo/1.0/FooCallbackAll.cpp
@@ -43,6 +26,23 @@
 LOCAL_GENERATED_SOURCES += $(GEN)
 
 #
+# Build types.hal
+#
+GEN := $(intermediates)/android/hardware/tests/foo/1.0/types.cpp
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+    $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+    -Lc++ -randroid.hardware:hardware/interfaces\
+    android.hardware.tests.foo@1.0::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))
+
+$(GEN): $(LOCAL_PATH)/types.hal
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
 # Build IFoo.hal
 #
 GEN := $(intermediates)/android/hardware/tests/foo/1.0/FooAll.cpp
@@ -61,6 +61,7 @@
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
 LOCAL_SHARED_LIBRARIES := \
+  libhidl \
   libhwbinder \
   libutils \
 
diff --git a/tests/libhwbinder/1.0/Android.mk b/tests/libhwbinder/1.0/Android.mk
index 796f672..733095c 100644
--- a/tests/libhwbinder/1.0/Android.mk
+++ b/tests/libhwbinder/1.0/Android.mk
@@ -27,6 +27,7 @@
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
 LOCAL_SHARED_LIBRARIES := \
+  libhidl \
   libhwbinder \
   libutils \
 
diff --git a/tests/msgq/1.0/Android.mk b/tests/msgq/1.0/Android.mk
index cf5475a..618c076 100644
--- a/tests/msgq/1.0/Android.mk
+++ b/tests/msgq/1.0/Android.mk
@@ -27,6 +27,7 @@
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
 LOCAL_SHARED_LIBRARIES := \
+  libhidl \
   libhwbinder \
   libutils \