Fix NXP_CHIP_TYPE and compile errors am: 615a7be8d8 am: 8442d32a5b
am: 054eba7bfb

Change-Id: I74f91b8969a2882435c833f6bdc77e96ed989bbe