Merge "AVB: allow no metadata in the generic system.img for project Treble"
am: c70bf5836c

Change-Id: I583d9357df07c958778533599b9d91d00c255eb0