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

Change-Id: Idb8524e5acb0de6a8f60ceef624673317235a3b5