Revert "Make FirstTarget treat HostCross separately from Host"

This reverts commit c5d7ad6b68.

Reason for revert: Speculatively reverting as likely cause of mac build breakage

Change-Id: I30fbbaaac28f3a2fe8bc1c05775d3de248199b29

android/arch.go

@@ -1843,23 +1843,20 @@ func getCommonTargets(targets []Target) []Target {
 }
 
 // FirstTarget takes a list of Targets and a list of multilib values and returns a list of Targets
-// that contains zero or one Target for each OsType and HostCross, selecting the one that matches
+// that contains zero or one Target for each OsType, selecting the one that matches the earliest
-// the earliest filter.
+// filter.
 func FirstTarget(targets []Target, filters ...string) []Target {
 	// find the first target from each OS
 	var ret []Target
-	type osHostCross struct {
+	hasHost := false
-		os        OsType
+	set := make(map[OsType]bool)
-		hostCross bool
-	}
-	set := make(map[osHostCross]bool)
 
 	for _, filter := range filters {
 		buildTargets := filterMultilibTargets(targets, filter)
 		for _, t := range buildTargets {
-			key := osHostCross{t.Os, t.HostCross}
+			if _, found := set[t.Os]; !found {
-			if _, found := set[key]; !found {
+				hasHost = hasHost || (t.Os.Class == Host)
-				set[key] = true
+				set[t.Os] = true
 				ret = append(ret, t)
 			}
 		}