Merge changes from topic "fscrypt-key-mgmt-improvements"

* changes:
  vold: support v2 encryption policies
  vold: use new ioctls to add/remove fscrypt keys when supported
diff --git a/Android.bp b/Android.bp
index 55def04..b621f35 100644
--- a/Android.bp
+++ b/Android.bp
@@ -86,6 +86,7 @@
 
 cc_library_headers {
     name: "libvold_headers",
+    recovery_available: true,
     export_include_dirs: ["."],
 }