Merge "libfscrypt: Remove an unused variable"