Merge "Add vbmake to build super_vbmeta.img"
am: 1c23735731

Change-Id: I44de5a5c1c67e3d23a10a9b18d1e03c52fcabd93