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

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

Change-Id: I6e798e2b0aab8ecc9cf1ec3f5542da9fb351779f