Merge "hikey960: use /dev/block/by-name/ for userdata mountpoint" am: 1ad3635624 am: 9e802373d7
am: 3b18d74935

Change-Id: I993993458231fc332681134b8800481f0ba3d033