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

Change-Id: I8d11be54322e57b9bf904907198b7058af7be4df