Switch to open source superuser

Change-Id: I0882b4bb296af041ec5766ff29a605554f13b0a7
Merge "Switch to open source superuser" into jb-mr1