Re-Track our Nfc app

Source up to 4.3 // Polling mode is back

Signed-off-by: Evan Anderson <evan1124@gmail.com>

Conflicts:
	default.xml

Change-Id: I39db94d71d566c97402fb9d120764fd3827fd630