diff --git a/bluetooth/manifest_bluetooth.xml b/bluetooth/manifest_bluetooth.xml
index 1747d8b..64238c7 100644
--- a/bluetooth/manifest_bluetooth.xml
+++ b/bluetooth/manifest_bluetooth.xml
@@ -26,6 +26,15 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>hardware.google.bluetooth.ext</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IBluetoothExt</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>hardware.google.bluetooth.ccc</name>
         <transport>hwbinder</transport>
diff --git a/device-cheetah.mk b/device-cheetah.mk
index 31de31a..0e3a524 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -149,6 +149,10 @@ PRODUCT_PACKAGES += \
 	libspatialaudio \
 	librondo
 
+# Bluetooth hci_inject test tool
+PRODUCT_PACKAGES_DEBUG += \
+    hci_inject
+
 # Keymaster HAL
 #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service
 
diff --git a/device-panther.mk b/device-panther.mk
index f7ae787..9312a70 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -131,6 +131,10 @@ PRODUCT_PACKAGES += \
 	libspatialaudio \
 	librondo
 
+# Bluetooth hci_inject test tool
+PRODUCT_PACKAGES_DEBUG += \
+    hci_inject
+
 # Keymaster HAL
 #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service