Correctly track the source of imports with the same name
auto merge of #6648 : alexcrichton/rust/issue-6633, r=graydon

Resolves #6633 and removes an unnecessary import in libcore