Merge "hikey960: Allow userdata f2fs mount"
am: 9a96ef189a

Change-Id: I974f1b05cd5756299758ee055639422b28ecc2c6