Merge "Construct the super_vbmeta image" am: da6525c2db am: 6a7f27a4c2 am: 347be853ae
am: 9d4352c0f3

Change-Id: Ib6842298f0c2e5843d3f5eb627f58eb22dcb6a52