Switch to new Superuser

Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c
Use proper api

Change-Id: Ie93c95366833e6f9e111aee2b551c469db3a0757
Move superuser to customization

Change-Id: I80d019d06b91be3a26a006f03f7c573a6f4e4262