Additions to get Koushs Superuser working

Change-Id: I0bbe796e4aa2e7bdff7fd2de5a6886fa96fb013b