Merge branch 'tizen_3.0_dev' into tizen_4.0

Change-Id: I86aea82642339739dffcc64991047db475e121d4

diff --cc parser/msg_parser.c
Simple merge

diff --cc uprobe/arch/x86/swap-asm/swap_uprobes.c
Simple merge

diff --cc uprobe/swap_uprobes.c
Simple merge

diff --cc uprobe/swap_uprobes.h
Simple merge