Fix NXP_CHIP_TYPE and compile errors am: 615a7be8d8 am: 8442d32a5b
am: 4adb68bdf3

Change-Id: I6ba4bef33270b13e9c4dcbac69a3f2c721e01e7a