Merge "Userspace reboot: Support remounting userdata for f2fs"
am: 8a603a7f9b

Change-Id: I93e505832ae1e9758d5efb595b6b6b9cf7a54b25