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

Change-Id: Ie8ec82820946766aea85a43757f0507a42ea0ef9