NXP-14398: cleanup; fix MP build and test