Oops didnt need that gps stuff in that commit

Change-Id: I737e4a51f5ca10168e52a2e4ae726ab7bb2435a5
PN544 NFC
Conflicts:

	device.mk
	nfc/nfc_hw.c
	ueventd.mako.rc

Change-Id: I70e73388405c14c88a7cedb41c7efac91463917e