FM: Add HIDL support on O release

Add fm HIDL support on O release.

CRs-fixed: 2019165
Change-Id: I49b3294cdefbf763e5ad2e8f5776e9fc6393400c
diff --git a/fm_hci/Android.mk b/fm_hci/Android.mk
index f0e620e..8e76406 100644
--- a/fm_hci/Android.mk
+++ b/fm_hci/Android.mk
@@ -2,35 +2,24 @@
 
 include $(CLEAR_VARS)
 
-# Setup bdroid local make variables for handling configuration
-ifneq ($(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR),)
-  bdroid_C_INCLUDES := $(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR)
-  bdroid_CFLAGS += -DHAS_BDROID_BUILDCFG
-else
-  bdroid_C_INCLUDES :=
-  bdroid_CFLAGS += -DHAS_NO_BDROID_BUILDCFG
-endif
-
-BDROID_DIR:= system/bt
-
-LOCAL_CFLAGS += $(bdroid_CFLAGS)
-
 LOCAL_SRC_FILES := \
-    fm_hci.c
+    fm_hci.cpp
 
 LOCAL_SHARED_LIBRARIES := \
          libdl \
+         libcutils \
+         libbase \
+         libhidlbase \
+         libhidltransport \
+         libhwbinder \
          liblog \
-         libcutils
+         libutils \
+         android.hidl.base@1.0 \
+         vendor.qti.hardware.fm@1.0 \
 
 LOCAL_CFLAGS := -Wno-unused-parameter
 
-LOCAL_CFLAGS += -std=c99
-
 LOCAL_C_INCLUDES += \
-        $(BDROID_DIR)/hci/include \
-        $(BDROID_DIR)/stack/include \
-        $(BDROID_DIR)/osi/include \
         $(LOCAL_PATH)/../helium \
         $(LOCAL_PATH)/fm_hci