Merge "Make ext4 userdata checkpoints work with metadata encryption"
am: 99ae1d943b

Change-Id: I99cf77500ce51acc0ad71b28c529ffcbae0ccbb8