Fix more import_shadowing fallout in libcollections and librustrt.
Fix fallout of removing import_shadowing in tests.