Merge remote-tracking branch 'cm_mako_device/cm-12.0' into cm-12.0

Conflicts:
	BoardConfig.mk
	WCNSS_qcom_cfg.ini
	apns-full-conf.xml
	apq8064-tabla-snd-card_Button_Jack.kl
	camera/Android.mk
	camera/QCamera/HAL/core/Android.mk
	camera/QCamera/HAL/core/inc/QCameraHWI.h
	camera/QCamera/HAL/core/inc/QCameraHWI_Mem.h
	camera/QCamera/HAL/core/src/QCameraHWI.cpp
	camera/QCamera/HAL/core/src/QCameraHWI_Mem.cpp
	camera/QCamera/HAL/core/src/QCameraHWI_Parm.cpp
	camera/QCamera/stack/mm-camera-interface/Android.mk
	camera/QCamera/stack/mm-camera-test/src/mm_qcamera_display.c
	camera/QCameraHWI.cpp
	camera/QCameraHWI.h
	camera/QCameraHWI_Mem.cpp
	camera/QCameraHWI_Mem.h
	camera/QCameraHWI_Parm.cpp
	camera/QualcommCamera2.cpp
	camera/QualcommCameraHardware.cpp
	camera/QualcommCameraHardware.h
	camera/mm-camera-interface/Android.mk
	conn_init/conn_init.c
	conn_init/wfc_util_fctrl.c
	device.mk
	init.aries.rc
	nfc/libnfc-brcm.conf
	overlay/frameworks/base/core/res/res/values/config.xml
	proprietary-blobs.txt
	recovery/Android.mk
	recovery/recovery_ui.cpp
	self-extractors/extract-lists.txt
	self-extractors/generate-packages.sh
	self-extractors/qcom/staging/device-partial.mk
	sepolicy/file_contexts
	snd_soc_msm_2x_Fusion3
	ueventd.aries.rc