Merge "fs_mgr: support using libavb to enable dm-verity" am: 0a3c2392c7
am: 07c1bcbc7b

Change-Id: Ia280284d106dd7263a85de9aa9f8309d7fecab93