Merge "libfscrypt: Remove an unused variable"
am: a596802d39

Change-Id: I6554b3b5c144123fbf709db577191394d8a7b81c