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

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

Change-Id: Ia0d62ccde1f14abd901bf52cb12af9e4482ab114