Merge "AVB: allow no metadata in the generic system.img for project Treble" into oc-dr1-dev am: ad692c9b29  -s ours
am: b9b132c09a  -s ours

Change-Id: Ie9c36761323697082dc53ecc7e60ca494e56230b