Exynos4: Fix build

Change-Id: Idb327b37156e2014a34a8831ce6d60769e3217af
Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_hardware_samsung into cm-12.0

Conflicts:
	exynos4/hal/include/sec_utils.h
	exynos4/hal/libgralloc_ump/alloc_device.cpp
	exynos4/hal/libhwcomposer/SecHWCUtils.h