orion: Make sub-targets augment FEATURES, not re-define it