Clean up some unnecessary imports.

Change-Id: I10560826cbf3b2ae151f9fe7294560bf7e0f1911
2 files changed