Revert "Move superuser header below Developer Options"

This reverts commit f805f455f9c15e49bac65a0609b567719a6b4e29.
Revert "Fix scrollbars appearing out of place in Superuser."

This reverts commit 2b10f4598da5a87fa57153d217e8282f7bc5bd57.
Fix custom lockscreen
Revert "Switch to new Superuser"

This reverts commit b474742e24e1d3ccd84129e50ce997e533b9d234.
Fix utils.java