Port Superuser in Settings from CyanogenMod

Switch to new Superuser

Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c

Conflicts:
	Android.mk
	proguard.flags

Fix scrollbars appearing out of place in Superuser.

Change-Id: Ia206623716192e479901c02cf94de84a29e0479e