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

Change-Id: I6fabe94cb958eafe24f01cb8b73dd26cfe8e0db5