am e28ae87a: Merge "Use ext4 file system for generic_x86 userdata partition"

* commit 'e28ae87af9a9b83ce7e1821d4840edf3b99aec0e':
  Use ext4 file system for generic_x86 userdata partition