Merge "libfscrypt: drop a local UAPI definition" am: 6291e18976 am: 083fc26f38

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1364947

Change-Id: I23a46271ca692a8f2007732f0d428280cca95bd8