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

Conflicts:
	Android.mk
	BoardConfigCommon.mk
	camera/Android.mk
	camera/CameraWrapper.cpp
	msm8960.mk