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

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

Change-Id: Iae3d06c2d6b8b837a7becc763eb5c8c81ae7c4b6