diff --git a/adb/Android.mk b/adb/Android.mk
index 4d5ae14..bb974d8 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -14,7 +14,7 @@
 adb_version := $(shell git -C $(LOCAL_PATH) rev-parse --short=12 HEAD 2>/dev/null)-android
 
 ADB_COMMON_CFLAGS := \
-    -Wall -Werror \
+    -Wall -Wextra -Werror \
     -Wno-unused-parameter \
     -Wno-missing-field-initializers \
     -DADB_REVISION='"$(adb_version)"' \
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 9fe1b4f..436465a 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -265,6 +265,7 @@
     chmod 0660 /data/misc/wifi/wpa_supplicant.conf
     mkdir /data/local 0751 root root
     mkdir /data/misc/media 0700 media media
+    mkdir /data/misc/vold 0700 root root
 
     # For security reasons, /data/local/tmp should always be empty.
     # Do not place files or directories in /data/local/tmp
@@ -314,6 +315,9 @@
     mkdir /data/system/heapdump 0700 system system
     mkdir /data/user 0711 system system
 
+    # Set up the crypto policies on /data/user
+    exec -- /system/bin/vdc cryptfs setusercryptopolicies /data/user
+
     # Reload policy from /data/security if present.
     setprop selinux.reload_policy 1