Fix conflict vendor proprietary Protocol and Discovery technology definitions

A new configuration option is added.
Vendor should provide their own definition in libnfc-brcm.conf file.

Change-Id: I8204fbb97bcb59ecf7b450b701546646e1952a78
1 file changed