Merge "Use default libnfc-nci.conf if not found in vendor/etc"