Merge "vold: drop local fscrypt UAPI definitions" am: 47425d05a9 am: 83a3eecc03 am: 6b36554b38 am: cb640677a7 am: e0ffab6cb4

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365221

Change-Id: Id21d662bf023c7ccc6b6117691d454f9f5dbf5a6