merge Superuser into Settings

Change-Id: I5ed56cb8c0fc205b29f9779f1dd55cbfffc5c9e5
Update strings.xml
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1