Remove duplicate imports.

Change-Id: I1cb1e40e34ad85e5158d9f620ce832a0136d41ae
Merge "Remove duplicate imports." into jellybean-mr2.1