Cleanup src/librustc/back
auto merge of #7219 : sstewartgallus/rust/cleanup, r=graydon