Merge "hikey960: Fix fstab.hikey960 to support USB mass storage devices"