Revert "Merge Superuser into Settings"

This reverts commit fa49b77dcc94c8b5735e7395c4627b7d3b56ae21.
Switch to new Superuser

Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c