intergrated superuser patched

...

 On branch jb-stock-test
 Changes to be committed:
	modified:   Android.mk
	modified:   AndroidManifest.xml
	modified:   proguard.flags
	modified:   res/xml/settings_headers.xml

Change-Id: I52d52cb9db393b3de258f12c02a13a17429b5de5