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

Change-Id: I45fbd357b6d1ffcc98ae146843176300548ee67b