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

Change-Id: Ic6a1cb4a886ac4fe24afba8343e28b6ab1e8bbc6