card emulation patch port to JB

Change-Id: I86657f9c547840de33c35df4912b5f282d4fe459

Conflicts:
	src/phHal4Nfc_ADD.c