Merge "cryptfs: Update the size of dm-crypt device according to sector size"