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

Change-Id: Ib70fc1db6cb3916af009c73714d6570fc6a73e80