Reconcile with jb-mr1-release - do not merge

Change-Id: Ia5d484b16bf45e3a8481bf5c81864474749f964e
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 1ed1323..89aafaf 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -418,7 +418,7 @@
     socket rild stream 660 root radio
     socket rild-debug stream 660 radio system
     user root
-    group radio cache inet misc audio sdcard_r sdcard_rw log
+    group radio cache inet misc audio log
 
 service surfaceflinger /system/bin/surfaceflinger
     class main
@@ -437,7 +437,7 @@
 service drm /system/bin/drmserver
     class main
     user drm
-    group drm system inet drmrpc sdcard_r
+    group drm system inet drmrpc
 
 service media /system/bin/mediaserver
     class main