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

Change-Id: I6fbbda75837aa7fee0bfc9faf0e9282a00caedf3