Revert "Switch to open source superuser"

This reverts commit 43213c2f10abec9f594c3ccff476ff0d38e0e2ec.
Revert "Move Superuser header below Developer Options"

This reverts commit cd7b3176a02be6980e6f6e12ae1acd871b65d3f3.
Switch to open source superuser

Change-Id: I0882b4bb296af041ec5766ff29a605554f13b0a7
Switch to new Superuser

Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c

Conflicts:

	AndroidManifest.xml
	proguard.flags
	res/xml/settings_headers.xml