Merge "Use enforce_vintf_manifest instead of treble."