Merge branch 'develop' into develop_qemu_2.6

diff --cc tizen/src/ecs/Makefile.objs
index 36ab220,b0a65ae..9276dd9
--- 1/tizen/src/ecs/Makefile.objs
--- 2/tizen/src/ecs/Makefile.objs
+++ b/tizen/src/ecs/Makefile.objs
@@@ -3,6 -3,6 +3,6 @@@ obj-y += ecs.o ecs_msg.o ecs_msg_inject
  obj-y += ecs_mon.o ecs-json-streamer.o
  obj-y += ecs_eventcast.o
  obj-y += ecs_sensor.o
 -obj-y += ecs_hds.o
 +obj-$(CONFIG_VIRTFS) += ecs_hds.o
  obj-y += ecs_nfc.o
- obj-y += ecs_sdcard.o
+ obj-y += ecs_sdcard.o

diff --cc tizen/src/ecs/ecs_msg_device.c
Simple merge

diff --cc tizen/src/ecs/ecs_sensor.c
Simple merge

diff --cc tizen/src/hw/virtio/maru_virtio_sensor.c
Simple merge