g3: remove nfc module suffix

Change-Id: I49c9369803761a0db0be4b0ce2e05515ea9f5194
g3: fix NFC

* Update configuration for new module.

Change-Id: I1e85573c46c89ad2406b8f5ab6d0a8946d3edbc7
Merge "g3: remove nfc module suffix" into cm-12.0
Merge "g3: fix NFC" into cm-12.0
Merge branch 'cm' into HEAD