NXP-13009 fixup core dependencies