Merge remote-tracking branch 'x86/kitkat-x86' into lollipop-x86

diff --cc Android.mk
index 1cd6d2b,a8c1ac2..4b25f2f
--- 1/Android.mk
--- 2/Android.mk
+++ b/Android.mk
@@@ -14,7 -14,17 +14,16 @@@ LOCAL_SRC_FILES := hdaps.
  include $(BUILD_SHARED_LIBRARY)
  
  include $(CLEAR_VARS)
+ LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+ LOCAL_SHARED_LIBRARIES := liblog libcutils
+ LOCAL_MODULE := sensors.iio
+ LOCAL_MODULE_TAGS := optional
+ LOCAL_SRC_FILES := iio-sensors.cpp
+ include external/stlport/libstlport.mk
+ include $(BUILD_SHARED_LIBRARY)
+ 
+ include $(CLEAR_VARS)
  LOCAL_PRELINK_MODULE := false
 -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
  LOCAL_SHARED_LIBRARIES := liblog libcutils
  LOCAL_MODULE := sensors.kbd
  LOCAL_MODULE_TAGS := optional