Merge "hikey: Allow userdata f2fs mount" am: 8d1daf4478 am: 62f8782727
am: cb05302edd

Change-Id: Icb857c766e58b535005b6a84a9f2c15504160a1b