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

Change-Id: I96c4caba3401f9a5873dc1887443f3c037a51c8d