Merge "fs_mgr_verity: correct dm_target_spec->next" am: cb199c3fc7
am: 852afd14c8

Change-Id: I443b4eb3e1fb1225e3d6a346ccbbf5cbda88df04