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

Change-Id: If317d0a1b1854206dc2d3b575a8000207dde45f2