Merge "AVB: allow no metadata in the generic system.img for project Treble" am: c70bf5836c am: caa5b4417f am: 2410d0c792
am: 61cdb66230

Change-Id: I23cdb0a5826f3378245375c5f5551aa46edd8536