Merge "fs_mgr_avb: allow top-level vbmeta struct to be in 'boot' partition" am: 2e0f8a3b13
am: ec10a51d7d

Change-Id: I89d10accb3fc61cbe14627dad26d8a22d4e91543