Merge "Allow --disable-verification when top-level vbmeta is in 'boot'" am: e7180a796c am: 8665bb749f am: e318d9d5f6
am: 27991c33be

Change-Id: Ibc113d3f2e00aa23df4a35dbf2ecc073bfe04c75