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

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

Change-Id: I890fcacd143d72e5012c45126eef1eb31d6a00a8