Cleanup of hci layer

Remove unused variables and functions. Synchronized threads on fm
close and make the design modular.

Change-Id: I9bcba9f2b1740b73f52f199ae09c3f08f53499c9
diff --git a/fm_hci/Android.mk b/fm_hci/Android.mk
index 2546902..c164235 100644
--- a/fm_hci/Android.mk
+++ b/fm_hci/Android.mk
@@ -16,7 +16,7 @@
 LOCAL_CFLAGS += $(bdroid_CFLAGS)
 
 LOCAL_SRC_FILES := \
-	fm_hci.c
+    fm_hci.c
 
 LOCAL_SHARED_LIBRARIES := \
          libdl \
@@ -30,7 +30,8 @@
         $(BDROID_DIR)/hci/include \
         $(BDROID_DIR)/stack/include \
         $(BDROID_DIR)/osi/include \
-        $(LOCAL_PATH)/../helium
+        $(LOCAL_PATH)/../helium \
+        $(LOCAL_PATH)/fm_hci
 
 LOCAL_MODULE := libfm-hci
 LOCAL_MODULE_TAGS := optional