Revert "Revert "Integrate Koush SU into Settings""

This reverts commit 169a4634ae81a1ac479fafa981e60b72b55231b1.

Conflicts:
	AndroidManifest.xml

Change-Id: I3082999ad547e9bc03224b4978e07acf5ec53bf8