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

Change-Id: If0a7fce747ff10413c3e2f99dcf52dc4fd90a39d