FM: QSSI changes

 - remove redundant code
 - remove items going into vendor image
 - remove target specific tags

Change-Id: If3bd34bbdc353851a1007ff9fcb67cf44da8f61c
diff --git a/helium/Android.mk b/helium/Android.mk
index 4008dd6..737ed3f 100644
--- a/helium/Android.mk
+++ b/helium/Android.mk
@@ -1,6 +1,3 @@
-#ifeq ($(BOARD_HAVE_QCOM_FM),true)
-#ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM)))
-
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -15,7 +12,7 @@
          libnativehelper \
          libcutils
 
-FM_HCI_DIR:= vendor/qcom/opensource/fm
+FM_HCI_DIR:= vendor/qcom/opensource/commonsys/fm
 
 LOCAL_C_INCLUDES += $(FM_HCI_DIR)/fm_hci
 
@@ -23,8 +20,3 @@
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)
-
-#endif # is-vendor-board-platform
-#endif # BOARD_HAVE_QCOM_FM
-
-