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

Change-Id: I6f5bc6c919bdd1ad80563b29f0c44509abdd000b