Merge "Use enforce_vintf_manifest instead of treble." am: 108620f397 am: 66ffc76870
am: ae1a6c4116

Change-Id: Ia3de9ec8daced202bb90884a387ad40bc1b06e37