Merge "libfscrypt: add support for specifying 4K data units" into main