Backport Superuser from CM12