Merge "fs_mgr_avb: refactors how vbmeta is loaded" am: fc500ddb52
am: a6db40c7cd

Change-Id: I353b7601d616aa736d82659ad90c4828aec07383