Fix NXP_CHIP_TYPE and compile errors
am: c32f778b3b

Change-Id: I5f82497153d74328ce8c2ba367bb0f246db0af38