diff --git a/benchmarks/msgq/1.0/Android.mk b/benchmarks/msgq/1.0/Android.mk
index c51b479..b08d33f 100644
--- a/benchmarks/msgq/1.0/Android.mk
+++ b/benchmarks/msgq/1.0/Android.mk
@@ -30,6 +30,7 @@
   libhidl \
   libhwbinder \
   libutils \
+  libcutils \
 
 LOCAL_MULTILIB := both
 include $(BUILD_SHARED_LIBRARY)
diff --git a/nfc/1.0/Android.mk b/nfc/1.0/Android.mk
index 12af4b5..9b1d49c 100644
--- a/nfc/1.0/Android.mk
+++ b/nfc/1.0/Android.mk
@@ -70,6 +70,7 @@
   libhidl \
   libhwbinder \
   libutils \
+  libcutils \
 
 LOCAL_MULTILIB := both
 include $(BUILD_SHARED_LIBRARY)
diff --git a/nfc/1.0/INfc.hal b/nfc/1.0/INfc.hal
index 147348f..88fd39a 100644
--- a/nfc/1.0/INfc.hal
+++ b/nfc/1.0/INfc.hal
@@ -18,7 +18,6 @@
 
 import INfcClientCallback;
 
-@hal_type(type="NFC")
 interface INfc {
     /*
      * Opens the NFC controller device and performs initialization.
diff --git a/nfc/1.0/INfcClientCallback.hal b/nfc/1.0/INfcClientCallback.hal
index 1ed0adb..f10062e 100644
--- a/nfc/1.0/INfcClientCallback.hal
+++ b/nfc/1.0/INfcClientCallback.hal
@@ -16,7 +16,6 @@
 
 package android.hardware.nfc@1.0;
 
-@hal_type(type="NFC")
 interface INfcClientCallback {
     /*
      * The callback passed in from the NFC stack that the HAL
diff --git a/tests/bar/1.0/Android.mk b/tests/bar/1.0/Android.mk
index b6e3cc8..71eb751 100644
--- a/tests/bar/1.0/Android.mk
+++ b/tests/bar/1.0/Android.mk
@@ -30,6 +30,7 @@
   libhidl \
   libhwbinder \
   libutils \
+  libcutils \
   android.hardware.tests.foo@1.0 \
 
 LOCAL_MULTILIB := both
diff --git a/tests/baz/1.0/Android.mk b/tests/baz/1.0/Android.mk
index 45b1bf5..165237f 100644
--- a/tests/baz/1.0/Android.mk
+++ b/tests/baz/1.0/Android.mk
@@ -68,6 +68,7 @@
   libhidl \
   libhwbinder \
   libutils \
+  libcutils \
 
 LOCAL_MULTILIB := both
 include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/expression/1.0/Android.mk b/tests/expression/1.0/Android.mk
index 137aaf8..e35a104 100644
--- a/tests/expression/1.0/Android.mk
+++ b/tests/expression/1.0/Android.mk
@@ -30,6 +30,7 @@
   libhidl \
   libhwbinder \
   libutils \
+  libcutils \
 
 LOCAL_MULTILIB := both
 include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/expression/1.0/IExpression.hal b/tests/expression/1.0/IExpression.hal
index 3dea9a4..ead131f 100644
--- a/tests/expression/1.0/IExpression.hal
+++ b/tests/expression/1.0/IExpression.hal
@@ -15,7 +15,7 @@
  */
 
 package android.hardware.tests.expression@1.0;
-@hal_type(type="LIGHT")
+
 interface IExpression {
   enum UInt64LiteralTypeGuessing : uint64_t {
     noSuffixDec1 = 0,
diff --git a/tests/foo/1.0/Android.mk b/tests/foo/1.0/Android.mk
index fe72237..10a1266 100644
--- a/tests/foo/1.0/Android.mk
+++ b/tests/foo/1.0/Android.mk
@@ -68,6 +68,7 @@
   libhidl \
   libhwbinder \
   libutils \
+  libcutils \
 
 LOCAL_MULTILIB := both
 include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/libhwbinder/1.0/Android.mk b/tests/libhwbinder/1.0/Android.mk
index 079f484..b4d5a71 100644
--- a/tests/libhwbinder/1.0/Android.mk
+++ b/tests/libhwbinder/1.0/Android.mk
@@ -30,6 +30,7 @@
   libhidl \
   libhwbinder \
   libutils \
+  libcutils \
 
 LOCAL_MULTILIB := both
 include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/msgq/1.0/Android.mk b/tests/msgq/1.0/Android.mk
index c5b6c46..5ec5492 100644
--- a/tests/msgq/1.0/Android.mk
+++ b/tests/msgq/1.0/Android.mk
@@ -30,6 +30,7 @@
   libhidl \
   libhwbinder \
   libutils \
+  libcutils \
 
 LOCAL_MULTILIB := both
 include $(BUILD_SHARED_LIBRARY)