Merge "fstab.hikey: Fix up emulated-storage support no that sdcardfs isn't used"