Merge "Fix NXP_CHIP_TYPE and compile errors am: 615a7be8d8 am: 3cf270a278" into oc-dr1-dev-plus-aosp