Trivial: Remove redundant aliasing from imports

No change in logic. Some of the aliasing is not required in import
statements. So remove them.

Change-Id: I520539f8b36edd125e4e79d6404e2156b3efb510
Merge "Trivial: Remove redundant aliasing from imports"