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

Change-Id: Ibb53946e29b4eaa49443d6cf327bbe4f84b010c5