Fix SuperUser for real.

Change-Id: Iaf7a4516af57adf8a668be0e70617b8975ebada3