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

Change-Id: I4e1a75d8c34388c1b75ce4d9797f21530d01d1ac