Switch to new Superuser

Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c

Conflicts:
	Android.mk
	proguard.flags
Move Superuser header below Developer Options

Change-Id: Ica85aae0d3f06e6c5e837946cfc893d9e2f4fb7d

Conflicts:
	res/xml/settings_headers.xml