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

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

Change-Id: I8edd5aa108571dae089341c3910ef58744fe10dd