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

Change-Id: Ia964c5180682a5b3929b11f801d943024e8db2f7