[3/3] Settings: Built-in superuser

PS2: Fixed formatting issues

Change-Id: Ia38f5a7737b7aff1d4d8291285dd1a17a5e63c1e
Signed-off-by: Parthipan Ramesh <parthipan.ramesh@gmail.com>
Settings: Fix aapt locale set caused by SuperUser

This allow to display Settings in other language other than default
for whatever reason SuperUser breaks this on AOSP working behaviour
including this flag.

Whatever this does not break anything and will fix our issue till it is
inverstigated why the SuperUser overlay breakes the locale set.

Change-Id: Ie0d94a85b6b3f26cad853298b911c7fece0a1247
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge remote-tracking branch 'aospa/kitkat' into kitkat

Conflicts:
	proguard.flags

Change-Id: I1abe10baf97111f48949d081334820a5b7cde03b