Revert "Switch to open source superuser"

This reverts commit bcae3b626565df549ce712ad4b549a4f8327e07a.

Conflicts:
	Android.mk
	proguard.flags