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

Change-Id: Ie952bd7aa5fe1ac396e25dc11fd3987556751d4d