Merge "hikey: Allow userdata f2fs mount"