Cleanup rustc_features some more
#116550
Merged
rustc_features some more
#116550
rustc_features some more
#116550