Fix NXP_CHIP_TYPE and compile errors
am: 79d3baa4e1

Change-Id: I717b394c0c4ebbd376368722fac942f394efb85a