Merge "Fix encryption on Nexus 7 v1"
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 605b738..27924d0 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -101,4 +101,5 @@
         surfaceflinger.te \
         system_app.te \
         system_server.te \
-        ueventd.te
+        ueventd.te \
+        vold.te
diff --git a/sepolicy/vold.te b/sepolicy/vold.te
new file mode 100644
index 0000000..a0ecbc0
--- /dev/null
+++ b/sepolicy/vold.te
@@ -0,0 +1,2 @@
+# vold needs to load keystore which loads libtf_crypto_sst.so which has text relocations
+allow vold self:process execmem;