Revert "Add NFC bits"

Added upstream to jf-common

This reverts commit 7d9f1e7fbed8a4dccfd77fe157061971b513e26a.
Enable Google Wallet