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

Change-Id: Idc4e3c49256fb01b542311851f3585cbfe36c5e1