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
GPLv3 Headers

As an extension of PDroid (licensed under GNU GPLv3) these fall under the GPL
license. This is to affirm that fact and preserve attribution before too many
copies are let loose.

Change-Id: I254cfa62bb33959a56b1f72d7648b5bf3b97cf29
Add CollegeDev's preferred credit

Another rewritten commit, due to merge conflicts I just dont have the time to
deal with any other way. Inconsequential, really.

Change-Id: I18ed9fc9cb9ecc85b7e47feb363e4f926dc50ddc
Merge branch 'jb-mr1-release-openpdroid' into jb-mr1-release-openpdroid-devel

Conflicts:
	src/java/android/privacy/surrogate/PrivacyCDMAPhone.java