Merge "Make ext4 userdata checkpoints work with metadata encryption" am: 2c792e0720 am: 5f19ef31c8 am: 4ad86a9315
am: 4f4c7263ea

Change-Id: I621ceb7061c43c5023f6aae46e768ba4527b65cd