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

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

Change-Id: I80a6d04c5ea8a164d036ac5cc7b2c1a11dfd5be4