Merge branch 'cm-11.0' of github.com:CyanogenMod/android_device_samsung_msm8660-common into HEAD

Conflicts:
	BoardConfigCommon.mk
	sepolicy/device.te
	sepolicy/file_contexts
	sepolicy/ueventd.te