Switch Superuser: Koush > Chainfire [2/3]

Change-Id: Ifd0319e5e751b04db5d30b2d1356146dc19ca272
Merge "Switch Superuser: Koush > Chainfire [2/3]" into du44