Move Superuser header below Developer Options

Change-Id: Ica85aae0d3f06e6c5e837946cfc893d9e2f4fb7d
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1