Fix NXP_CHIP_TYPE and compile errors am: 615a7be8d8 am: 3cf270a278
am: 43cca80b4a

Change-Id: I01f8d192cb5e84423a6669e455e1bc17675ac5f1