Merge "defconfig: msm8974: Add NFC for 8974 devices"