Superuser 4.3 fix

Needed for superuser on 4.3.

Depends on tracking CM repos.

Change-Id: Ibc54c3e565ca3edd592668c21a9dde55574a2b4f
Signed-off-by: Evan Anderson <evan1124@gmail.com>