Revert "Revert "Generate extra userdata partition if needed""

This reverts commit ff061e6c99b6818be678b432eadb9737dabfad56.