Merge "Dexpreopt: use "speed-profile" if a system server jar has a profile."

	if !android.PrefixInList(preoptFlags, "--compiler-filter=") {

		var compilerFilter string

		if systemServerJars.ContainsJar(module.Name) {

			// Jars of system server, use the product option if it is set, speed otherwise.

			if global.SystemServerCompilerFilter != "" {

				// Use the product option if it is set.

				compilerFilter = global.SystemServerCompilerFilter

			} else if profile != nil {

				// Use "speed-profile" for system server jars that have a profile.

				compilerFilter = "speed-profile"

			} else {

				// Use "speed" for system server jars that do not have a profile.

				compilerFilter = "speed"

			}

		} else if contains(global.SpeedApps, module.Name) || contains(global.SystemServerApps, module.Name) {