Merge "init: fix first stage mount failure when two fstab entries have verity_loc"