Merge branch 'tizen_2.4_develop' into tizen_3.0_develop

Change-Id: I0f07cd5664457d0fa84c5a91fb402a5c7da060c3
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --cc include/sysemu/sysemu.h
Simple merge

diff --cc package/3.0-emulator-qemu-x86.install.macos-64
Simple merge

diff --cc package/build.common
index 9ccee67,ed3240e..fa7846e
--- 1/package/build.common
--- 2/package/build.common
+++ b/package/build.common
@@@ -5,10 -5,10 +5,10 @@@ build_common(
  
        cd ${SRCDIR}/tizen
  
-       PKG_CONFIG_PATH=${ROOTDIR}/lib/pkgconfig:${ROOTDIR}/remote/lib/pkgconfig:${ROOTDIR}/libav/lib/pkgconfig
+       PKG_CONFIG_PATH=${ROOTDIR}/lib/pkgconfig
        PATH=${PATH}:${ROOTDIR}/bin
  
 -      PKG_CONFIG_PATH=${PKG_CONFIG_PATH} ./emulator_configure.sh x86
 +      PKG_CONFIG_PATH=${PKG_CONFIG_PATH} ./emulator_configure.sh x86_64
  
        make clean
        PATH=${PATH} make all_dibs -j8

diff --cc tizen/emulator_configure.sh
Simple merge

diff --cc vl.c
Simple merge