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

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

Change-Id: I3c3e2875fca24150e74961faadf8ad3a63471f00