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

Change-Id: I81da678adcb1564be3a67fce2a85b3829ec09187