Merge "Add vbmake to build super_vbmeta.img"