Merge branch 'cm' into HEAD

Signed-off-by: DHOMD <DHO@dho.im>

Conflicts:
	BoardConfig.mk
	camera/Android.mk
	camera/CameraWrapper.cpp
	configs/nfcee_access.xml
	configs/thermal-engine.conf
	configs/thermald.conf
	device.mk
	gps/utils/loc_cfg.cpp
	gps/utils/log_util.h
	init/init_jflte.c
	overlay/frameworks/base/core/res/res/values/config.xml
	proprietary-files.txt
	rootdir/etc/init.qcom.rc
	rootdir/etc/init.target.rc
	rootdir/etc/ueventd.qcom.rc
	system.prop

Change-Id: I1ec23704b6a38b3d7d4d7b3f2e71b255fabe00f7