Merge "Construct the super_vbmeta image"
am: da6525c2db

Change-Id: I812f43af4614d26a19399efccd11686ae858a63d