Fix superuser app

Conflicts:
	Android.mk
	AndroidManifest.xml

Change-Id: I88ce267d3b6ff9969546cabf9462d01f5763137b
Settings: add Quicksettings Notification Ribbons (2/2)

Change-Id: I1a7d473a29f70b84b8d38009de7be4cae90ad39f

Conflicts:
	AndroidManifest.xml
	res/values-es/revo_strings.xml
	res/values/revo_strings.xml