Merge remote-tracking branch 'origin/caf/caf-wlan/master' into jb_mr1
Make ext CAF == jb_mr1 by replacing conflict files with ext CAF files.
Conflicts:
CORE/HDD/inc/wlan_hdd_cfg.h
CORE/HDD/src/wlan_hdd_main.c
CORE/HDD/src/wlan_hdd_tdls.c
CORE/MAC/src/pe/lim/limFT.c
CORE/MAC/src/pe/lim/limProcessMessageQueue.c
CORE/MAC/src/pe/lim/limPropExtsUtils.c
CORE/MAC/src/pe/lim/limScanResultUtils.c
CORE/SME/inc/smeRrmInternal.h
CORE/SME/src/QoS/sme_Qos.c
CORE/SME/src/csr/csrTdlsProcess.c
CORE/SME/src/pmc/pmcApi.c
CORE/SME/src/rrm/sme_rrm.c
CORE/SYS/legacy/src/pal/inc/palApi.h
CORE/SYS/legacy/src/utils/src/dot11f.c
CORE/WDI/WPAL/src/wlan_qct_pal_api.c
riva/inc/wlan_nv.h
riva/inc/wlan_nv2.h
Change-Id: I62abffb61fb213c0dace93364fa03cc9901a68f0