revert ag/2671635 from oc-release
(cherry picked from commit bd9a5079b7d4be0dda94d2cbe204eb162ac2f949)

Change-Id: Iac8018e3f6faba898bc13825bd4aef2fa38cc452
diff --git a/halimpl/pn54x/Android.mk b/halimpl/pn54x/Android.mk
index c5a0030..cfbb9ce 100644
--- a/halimpl/pn54x/Android.mk
+++ b/halimpl/pn54x/Android.mk
@@ -35,6 +35,9 @@
 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))