Remove all uses of feature(import_shadowing).

r? @erickt
CC @gereeter is this acceptable to you (apparently we were import shadowing with the variants of the same name).