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

Change-Id: Ib9680f060e7024d566f4b0c822a05ee19b8178df