Revert "Switch to koush superuser"

This reverts commit 6a83882611632133ab130918be622819a0be7b8d.

Conflicts:
	Android.mk