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

Change-Id: I4f61820b9e0fc042b6048745b39b59deef09106e