Merge branch 'tizen' into security-manager

Change-Id: I12966cd0f6a6d0a38ddd73400918989e470c9e72

diff --cc packaging/security-tests.spec
index 20b1139,4efc6b0..f981779
--- 1/packaging/security-tests.spec
--- 2/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@@ -28,9 -28,9 +28,10 @@@ BuildRequires: pkgconfig(libtzplatform-
  BuildRequires: boost-devel
  BuildRequires: pkgconfig(vconf)
  BuildRequires: pkgconfig(libgum) >= 1.0.5
 +BuildRequires: pkgconfig(security-privilege-manager)
  Requires: perf
  Requires: gdb
+ Requires: diffutils
  
  %global ckm_test_dir %{?TZ_SYS_SHARE:%TZ_SYS_SHARE/ckm-test/}%{!?TZ_SYS_SHARE:/usr/share/ckm-test/}
  %global ckm_rw_data_dir %{?TZ_SYS_DATA:%TZ_SYS_DATA/ckm/}%{!?TZ_SYS_DATA:/opt/data/ckm/}