Fix NXP_CHIP_TYPE and compile errors
am: 615a7be8d8

Change-Id: Ib8bcfa3b385f43fcc18b1afed8400a382755c557
diff --git a/halimpl/pn54x/Android.mk b/halimpl/pn54x/Android.mk
index cfbb9ce..c5a0030 100644
--- a/halimpl/pn54x/Android.mk
+++ b/halimpl/pn54x/Android.mk
@@ -35,9 +35,6 @@
 D_CFLAGS += -DPN553=4
 endif
 
-#### Select the CHIP ####
-NXP_CHIP_TYPE := $PN553
-
 ifeq ($(NXP_CHIP_TYPE),$(PN547C2))
 D_CFLAGS += -DNFC_NXP_CHIP_TYPE=PN547C2
 else ifeq ($(NXP_CHIP_TYPE),$(PN548C2))