Sync ext4 encryption as of commit dffd334e4d7134