Revert "Edits to add Koush Superuser"

This reverts commit ce15055b801d21854378381b5ba96d4e00f1e97e.
Switch to new Superuser

Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c
Revert "Switch to new Superuser"

This reverts commit 67e3b282d0f75ae2b4daa64798f2dcdf3f2bcfbd.