Implementation of Koush superuser (2/3)

Change-Id: Id048b9d0f5479bd6d5c583dfb6ee2ea7050e1b1e
Merge "Implementation of Koush superuser (2/3)" into jb4.2