Merge "Rename libnfc-brcm.conf -> libnfc-nci.conf"