Get rid of CM superuser

Change-Id: I6bee7e098203f11d3e056dcd66db953dc953d8c8