Merge "fscrypt: Fix Data Unit Number used in file encryption"