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

Conflicts:
	BoardConfig.mk
	device.mk