Fix NXP_CHIP_TYPE and compile errors
am: 615a7be8d8

Change-Id: I75b2baac1736143fc924e33990ae96af955e359d