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

Change-Id: If296bb735ff90ef3ff6b2545360fbffd1c689636