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

Change-Id: I26facf10e9c59f19c0e06b3c61c87d52f303922b