Merge "Use new libfscrypt interface"