Superuser: Code cleanup

Seperated from original commit to let it merge faster

Change-Id: I2af5307b8d70cf8b436e52a03b78512674d18549
Merge "Superuser: Code cleanup" into cm-10.1