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

Change-Id: I350a4a6cc8ed052ec5ac2208add168f6a0b5ba92