Merge "Add erofs to supported fs type"