Merge branch 'tizen' into tizen_2.3

Merge branch 'tizen' into tizen_2.3

Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Conflicts:
	hw/virtio/virtio-pci.c
	hw/virtio/virtio-pci.h
	package/build.macos-64
	package/build.ubuntu-32
	package/build.ubuntu-64
	package/build.windows-32
	package/changelog
	package/pkginfo.manifest
	tizen/src/Makefile.tizen
	tizen/src/Makefile.tizen.i386
	tizen/src/debug_ch.c
	tizen/src/debug_ch.h
	tizen/src/display/maru_sdl.c
	tizen/src/display/maru_sdl_processing.c
	tizen/src/display/maru_shm.c
	tizen/src/display/maru_shm.h
	tizen/src/ecs/Makefile.tizen
	tizen/src/ecs/ecs.c
	tizen/src/ecs/ecs_eventcast.h
	tizen/src/ecs/ecs_msg.c
	tizen/src/ecs/ecs_tethering.c
	tizen/src/emul_state.c
	tizen/src/emul_state.h
	tizen/src/emulator.c
	tizen/src/eventcast/common.h
	tizen/src/eventcast/msg/eventcast.proto
	tizen/src/hw/maru_pm.c
	tizen/src/hw/pci/maru_brillcodec.c
	tizen/src/hw/virtio/maru_virtio_jack.h
	tizen/src/hw/virtio/maru_virtio_nfc.c
	tizen/src/hw/virtio/maru_virtio_sensor.h
	tizen/src/sdb.c
	tizen/src/sdb.h
	tizen/src/skin/client/skins/mobile-320x480-3btn/default.dbi
	tizen/src/skin/client/skins/mobile-480x800-3btn/default.dbi
	tizen/src/skin/client/skins/mobile-720x1280-3btn/default.dbi
	tizen/src/skin/client/skins/mobile-general-3btn/default.dbi
	tizen/src/skin/client/skins/wearable-general-1btn/default.dbi
	tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
	tizen/src/skin/maruskin_operation.c
	tizen/src/skin/maruskin_server.c
	tizen/src/tethering/Makefile.tizen
	tizen/src/tethering/app_tethering.h
	tizen/src/tethering/common.h
	tizen/src/tethering/genmsg/tethering.pb-c.c
	tizen/src/tethering/genmsg/tethering.pb-c.h
	tizen/src/tethering/touch.h
	tizen/src/util/osutil-linux.c
	tizen/src/util/osutil-win32.c
	tizen/src/util/osutil.h