Merge "fs_mgr_avb: refactors how vbmeta is loaded"