SuperUser: Changing to CM's SU [2/3]

Patchset 2:
Added Missing Changes

Change-Id: Iff401a5a6f9273add14394091297904a155cfe37