g2: Clean common NFC

-Current system screws up ALL variants NFC
-Replace libnfc-brcm.conf with stock for d80x and vs980 and move
 to device repos

Change-Id: I347f68948a88074122675ca372757658598eaabb
g2: TEMP: Fix CDMA

Change-Id: I1624b89e642c3d7008385f708a1797cd578a8f58