Merge "Reject zip archives with entry names containing \0." into lmp-dev
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 4dd8458..4d4bc86 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -553,7 +553,7 @@
     group radio cache inet misc audio log
 
 service surfaceflinger /system/bin/surfaceflinger
-    class main
+    class core
     user system
     group graphics drmrpc
     onrestart restart zygote
@@ -584,7 +584,7 @@
     # encryption)
 
 service bootanim /system/bin/bootanimation
-    class main
+    class core
     user graphics
     group graphics
     disabled