Merge "Add basic support for remounting ext4 userdata into checkpoint" am: 9f71d6193a
am: 6e7f3735f6

Change-Id: I685cf3a02c2bbf327ca4f7df78bc31478b5f1aaa