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