Merge "init: fix first stage mount failure when two fstab entries have verity_loc" am: 8df35dcb1c
am: 8954cd9379

Change-Id: Ibad203ee65a7f09592280ee2bb8d7331ebd9afee