Merge "fs_mgr_verity: support updating actual block device path in verity table" am: 4c28ca1ac8 am: 95d78849b4 am: 3b0512b75c
am: fecd8c26cf

Change-Id: Id343ecda5001d72183cfe782217cb62e8dbe2716