Merge "Include vbmeta.img into <product>-img.zip" into oc-mr1-dev