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