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