Remove Superuser

Change-Id: I0c8a595a70085e62036aa39d422b20f24786f1bf
Merge "Remove Superuser" into jellybean