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

Change-Id: If74bd70c2d3d4dcee5ab83783c9b72783a64b04d