Revert "Switch to new Superuser"

This reverts commit 0262078fe16fcf35b914a9a17a0616a5d4730dcb.

Conflicts:
	AndroidManifest.xml
	proguard.flags

Change-Id: I620bfc4efc5ac6ee2ee389011ad1f92e01d5f2ce