cm: Clean up cgroups

 * Remove unnecessary intermediate groups which are more harmful than
   helpful in some cases.
 * Remove weights, we're not using these.
 * Lock down the display group to system only.

Change-Id: I3a848fcc32459b53fa92317c253a20399637033e
diff --git a/prebuilt/common/etc/init.local.rc b/prebuilt/common/etc/init.local.rc
index 91ed111..3082cfa 100644
--- a/prebuilt/common/etc/init.local.rc
+++ b/prebuilt/common/etc/init.local.rc
@@ -11,7 +11,6 @@
     mount cgroup none /sys/fs/cgroup/bfqio bfqio
     write /sys/fs/cgroup/bfqio/bfqio.ioprio_class 2
     write /sys/fs/cgroup/bfqio/bfqio.ioprio 4
-    write /sys/fs/cgroup/bfqio/bfqio.weight 1000
     chown root system /sys/fs/cgroup/bfqio/tasks
     chmod 0666 /sys/fs/cgroup/bfqio/tasks
 
@@ -19,7 +18,6 @@
     mkdir /sys/fs/cgroup/bfqio/rt-audio 0755 root system
     write /sys/fs/cgroup/bfqio/rt-audio/bfqio.ioprio_class 1
     write /sys/fs/cgroup/bfqio/rt-audio/bfqio.ioprio 4
-    write /sys/fs/cgroup/bfqio/rt-audio/bfqio.weight 1000
     chown media system /sys/fs/cgroup/bfqio/rt-audio/tasks
     chmod 0664 /sys/fs/cgroup/bfqio/rt-audio/tasks
 
@@ -27,31 +25,13 @@
     mkdir /sys/fs/cgroup/bfqio/rt-display 0755 root system
     write /sys/fs/cgroup/bfqio/rt-display/bfqio.ioprio_class 1
     write /sys/fs/cgroup/bfqio/rt-display/bfqio.ioprio 7
-    write /sys/fs/cgroup/bfqio/rt-display/bfqio.weight 1000
-    chown system graphics /sys/fs/cgroup/bfqio/rt-display/tasks
+    chown system system /sys/fs/cgroup/bfqio/rt-display/tasks
     chmod 0664 /sys/fs/cgroup/bfqio/rt-display/tasks
 
-    # Display class
-    mkdir /sys/fs/cgroup/bfqio/display 0755 root system
-    write /sys/fs/cgroup/bfqio/display/bfqio.ioprio_class 2
-    write /sys/fs/cgroup/bfqio/display/bfqio.ioprio 0
-    write /sys/fs/cgroup/bfqio/display/bfqio.weight 1000
-    chown root system /sys/fs/cgroup/bfqio/display/tasks
-    chmod 0666 /sys/fs/cgroup/bfqio/display/tasks
-
-    # Hipri class
-    mkdir /sys/fs/cgroup/bfqio/hipri 0755 root system
-    write /sys/fs/cgroup/bfqio/hipri/bfqio.ioprio_class 2
-    write /sys/fs/cgroup/bfqio/hipri/bfqio.ioprio 2
-    write /sys/fs/cgroup/bfqio/hipri/bfqio.weight 1000
-    chown root system /sys/fs/cgroup/bfqio/hipri/tasks
-    chmod 0666 /sys/fs/cgroup/bfqio/hipri/tasks
-
     # Background class
     mkdir /sys/fs/cgroup/bfqio/bg 0755 root system
     write /sys/fs/cgroup/bfqio/bg/bfqio.ioprio_class 2
     write /sys/fs/cgroup/bfqio/bg/bfqio.ioprio 7
-    write /sys/fs/cgroup/bfqio/bg/bfqio.weight 1000
     chown root system /sys/fs/cgroup/bfqio/bg/tasks
     chmod 0666 /sys/fs/cgroup/bfqio/bg/tasks
 
@@ -59,7 +39,6 @@
     mkdir /sys/fs/cgroup/bfqio/idle 0755 root system
     write /sys/fs/cgroup/bfqio/idle/bfqio.ioprio_class 3
     write /sys/fs/cgroup/bfqio/idle/bfqio.ioprio 0
-    write /sys/fs/cgroup/bfqio/idle/bfqio.weight 1000
     chown root system /sys/fs/cgroup/bfqio/idle/tasks
     chmod 0666 /sys/fs/cgroup/bfqio/idle/tasks