Revert "SECURITY FIX: Fix package uids being reused between uninstall and reinstall of different packages."

This reverts commit d463ff433a4147f7d92eb04527142c6809475d3b.
Revert "Fix scrollbars appearing out of place in Superuser."

This reverts commit 5ad327440875dbffe657308d8ad385c92b1e1639.
Revert "Switch to new Superuser"

This reverts commit aa277b96ea522ddf60036ace15b836b148423f91.

Conflicts:
	Android.mk
	AndroidManifest.xml
	proguard.flags