Merge "defconfig: msm8610: enable Qualcomm NFC NCI driver"