Merge "Use ext4 file system for generic_x86 userdata partition"