Merge "Fix windows builds"

am: 706ce019e2

Change-Id: I09175d9afccbebb83be860844a58dff1947b61f7

android/arch.go

@@ -294,9 +294,13 @@ func ArchMutator(mctx BottomUpMutatorContext) {
 		if multilib == "" {
 			multilib = module.base().commonProperties.Default_multilib
 		}
-		prefer32 := false
-		if class == Device {
+		var prefer32 bool
+		switch class {
+		case Device:
 			prefer32 = mctx.AConfig().DevicePrefer32BitExecutables()
+		case HostCross:
+			// Windows builds always prefer 32-bit
+			prefer32 = true
 		}
 		targets, err := decodeMultilib(multilib, targets, prefer32)
 		if err != nil {