Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_device_samsung_jflte into cm-11.0
wifi: death to modules

Change-Id: Iedd708b117f02a101766a2ecbf53223b0186460e
BoardConfig: we're just using one defconfig now

Change-Id: I529325e87794263044d4cfd743becce1343c85fa

Conflicts:
	BoardConfig.mk