Merge "Add basic support for remounting ext4 userdata into checkpoint" am: 9f71d6193a am: 4f2c9dd189

Change-Id: I4edf3c826f91421da502d959d978a351a6e757c8