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

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1459984

Change-Id: Id2d9f0d336c6fb12eec8b50bdeb3ee691815a2ca