CM11 msm8960 common

Change-Id: I6d8dad28356f410520e5d55a73b7e352d2c29aeb
Merge branch 'cm-11.0' of github.com:spegelius/android_device_samsung_msm8960-common into cm-11.0

Conflicts:
	camera/Android.mk
	camera/CameraWrapper.cpp
	sepolicy/file.te
	sepolicy/file_contexts
	sepolicy/ueventd.te

Change-Id: I44222497030787f02160c6bf8ca6b5359fcfb60d