Merge "hikey960: Fix fstab.hikey960 to support USB mass storage devices" am: fe79c2d4df
am: 5b32041c9f

Change-Id: I6917e8e323dfbf881dd3cc3daeba874a1448511c