Merge "treble_common.mk: add the vbmeta.img to disable verification" into oc-mr1-dev