Remove tab/space causing problems

One of millions. These two were generating their own hunks in the patches.
and then failing. I will write something to clean all these up soon.

Change-Id: I7255631af4532844dcb28ade8143cac893bc3225
Move imports around to enable a wider patch

It needs to be up top because CM/AOKP add a constructor immediately before
the 'hide' and was breaking wide patching.

Change-Id: I3353a9f8da26e09f04ee3f04b6caecd4a0499f85