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

Change-Id: If52b3eacfada96adeedcbf5338a033e40a493bd0