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

Conflicts:
	BoardConfig.mk
	audio/mixer_paths.xml
	overlay/frameworks/base/core/res/res/values/config.xml
	overlay/frameworks/base/core/res/res/xml/storage_list.xml
	overlay/packages/apps/Camera2/res/values/config.xml
	overlay/packages/apps/Torch/res/values/config.xml
	proprietary-files.txt
	releasetools.py
	rootdir/etc/init.qcom.rc