Merge 71f87731c73203784546af27f6812bc264f84b0f on remote branch

Change-Id: Ic6553074f0bbdf3fb60a8c813fc6619b1f0e90cd
diff --git a/libfm_jni/Android.mk b/libfm_jni/Android.mk
index 28f770d..f62e3f1 100644
--- a/libfm_jni/Android.mk
+++ b/libfm_jni/Android.mk
@@ -24,6 +24,6 @@
 #LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
 LOCAL_MODULE := libfmjni
-include $(BUILD_SHARED_LIBRARY)
+#include $(BUILD_SHARED_LIBRARY)
 
 endif