Merge "Remove contact in boilerplate" into tizen

diff --cc lib/media-util-db.c
Simple merge

diff --cc lib/media-util-register.c
Simple merge

diff --cc src/common/include/media-common-system.h
Simple merge

diff --cc src/common/media-common-system.c
Simple merge

diff --cc src/server/media-server-device-block.c
Simple merge

diff --cc src/server/media-server-main.c
Simple merge