Fix NXP_CHIP_TYPE and compile errors
am: 615a7be8d8

Change-Id: Ib8bcfa3b385f43fcc18b1afed8400a382755c557