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

Change-Id: I243c97a4512ba1ef5ff03ee3bf6a6e41b4cba94a