Add support for extra NFC features

Conflicts:
	p880.mk

Change-Id: I0f5ce684875404722ff416d5b320a283bcedd4b7