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

Change-Id: Ie6aea60aa294196b69a0a0dd663c53ce0dacda00