Merge "hikey960: Avoid failures if sdcardfs.ko isn't present" am: ef1cddcc85 am: 45769a06bc

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

Change-Id: Ic036afdb3e2075a1b5816454704b690109ee2b6a