Merge "Explicit init .rc user."

applypatch/vendor_flash_recovery.rc

@@ -1,3 +1,4 @@
 service vendor_flash_recovery /vendor/bin/install-recovery.sh
     class main
     oneshot
+    user root

etc/init.rc

@@ -76,24 +76,29 @@ on late-init
 service ueventd /system/bin/ueventd
     critical
     seclabel u:r:ueventd:s0
+    user root
 
 service charger /system/bin/charger
     critical
     seclabel u:r:charger:s0
+    user root
 
 service recovery /system/bin/recovery
     socket recovery stream 422 system system
     seclabel u:r:recovery:s0
+    user root
 
 service adbd /system/bin/adbd --root_seclabel=u:r:su:s0 --device_banner=recovery
     disabled
     socket adbd stream 660 system system
     seclabel u:r:adbd:s0
+    user root
 
 service fastbootd /system/bin/fastbootd
     disabled
     group system
     seclabel u:r:fastbootd:s0
+    user root
 
 # Restart adbd so it can run as root
 on property:service.adb.root=1

uncrypt/uncrypt.rc

@@ -3,15 +3,18 @@ service uncrypt /system/bin/uncrypt
     socket uncrypt stream 600 system system
     disabled
     oneshot
+    user root
 
 service setup-bcb /system/bin/uncrypt --setup-bcb
     class main
     socket uncrypt stream 600 system system
     disabled
     oneshot
+    user root
 
 service clear-bcb /system/bin/uncrypt --clear-bcb
     class main
     socket uncrypt stream 600 system system
     disabled
     oneshot
+    user root