Revert "SuperUser: Changing to CM's SU [2/3]"

This reverts commit 7ef51391d739e9a2ddcc7fe82bc0a69fdc7e36e2.

Conflicts:

	proguard.flags
Revert "merge Superuser into Settings"

This reverts commit 764f3c641909747753a5c5f579f95ab6e31eed61.

Conflicts:

	AndroidManifest.xml
	proguard.flags
	res/xml/settings_headers.xml
Switch to new Superuser

Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c

Conflicts:

	proguard.flags
	res/xml/settings_headers.xml