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

Conflicts:
	BoardConfig.mk
	device.mk
	init/init_jflte.c
	overlay/frameworks/base/core/res/res/values/config.xml
	overlay/packages/apps/Settings/res/values/bools.xml
	overlay/packages/apps/Settings/res/values/config.xml
	proprietary-files.txt
	rootdir/etc/init.qcom.rc
	rootdir/etc/init.target.rc
	rootdir/etc/ueventd.qcom.rc
	sp.dependencies
	vendorsetup.sh