Merge "cryptfs: round down dm-crypt device size to crypto sector boundary" am: e7205eaa44
am: b45636cd35

Change-Id: I8361f350fdc16079e9cff61d161af5f0641865d1