Merge "hikey960: Allow userdata f2fs mount"