Fix SuperUser entries and move above SuperSU
Use holo alert drawable

These instances of the GB icon got missed in the big feature merge.

Change-Id: I4725be79af6e51e1aa5d575a32232bbac0a1127