Fix NXP_CHIP_TYPE and compile errors am: 615a7be8d8
am: 8442d32a5b

Change-Id: I04308bd36913d39c38b0a4d8e8649cbd181ff151