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