Merge "Replace dm-crypt.c with v3.4.108"