Merge "hikey: Allow userdata f2fs mount"
am: 8d1daf4478

Change-Id: I044029e2c4ec621473b1cbd21d58cd4d495a565d