update bundled rc files to their contents from rootdir/init.rc

Bug 23186545

Change-Id: I634b682b7a4cef9e1b817561b4458e1442443c63
(cherry picked from commit 6cb234dc57ae24f1dd0cb01217221d946eaed0aa)
diff --git a/vold.rc b/vold.rc
index dcf77a2..7719e0b 100644
--- a/vold.rc
+++ b/vold.rc
@@ -1,4 +1,7 @@
-service vold /system/bin/vold
+service vold /system/bin/vold \
+        --blkid_context=u:r:blkid:s0 --blkid_untrusted_context=u:r:blkid_untrusted:s0 \
+        --fsck_context=u:r:fsck:s0 --fsck_untrusted_context=u:r:fsck_untrusted:s0
     class core
     socket vold stream 0660 root mount
+    socket cryptd stream 0660 root mount
     ioprio be 2