Merge "fs_mgr_avb: refactors how vbmeta is loaded" am: fc500ddb52 am: a6db40c7cd am: 0265f55b44
am: 40ead9f41c

Change-Id: Ia44043112fa875b0f0d7ef0852fb279b5f2eda04