diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index f0eb209..1189ff4 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -25,7 +25,9 @@
 TARGET_GLOBAL_CFLAGS := $(HOST_GLOBAL_CFLAGS) -m32
 TARGET_GLOBAL_LDFLAGS := $(HOST_GLOBAL_LDFLAGS) -m32 -lpthread
 TARGET_NO_UNDEFINED_LDFLAGS := $(HOST_NO_UNDEFINED_LDFLAGS)
+ifeq ($(strip $(TARGET_ARCH_VARIANT)),)
 TARGET_ARCH_VARIANT := x86
+endif
 else #simulator
 
 # Provide a default variant.
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 97372cf..14f75fa 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -19,28 +19,22 @@
 
 PRODUCT_PACKAGES := \
 	SystemUI \
+	Launcher2 \
 	AccountAndSyncSettings \
 	Development \
 	DrmProvider \
 	Fallback \
 	GPSEnable \
-	Launcher2 \
 	Settings \
 	SdkSetup \
 	CustomLocale \
 	gpstest \
 	sqlite3 \
 	LatinIME \
-	PinyinIME \
-	OpenWnn \
-	libWnnEngDic \
-	libWnnJpnDic \
-	libwnndict \
 	CertInstaller \
 	LiveWallpapersPicker \
 	ApiDemos \
 	GestureBuilder \
-	SoftKeyboard \
 	CubeLiveWallpapers \
 	QuickSearchBox \
 	monkeyrunner \
@@ -48,6 +42,7 @@
 	jsr305lib \
 	jython \
 	jsilver
+
 #	Calculator \
 #	Camera \
 #	DeskClock \
@@ -55,8 +50,14 @@
 #	Gallery \
 #	Music \
 #	Mms \
+#	OpenWnn \
+#	libWnnEngDic \
+#	libWnnJpnDic \
+#	libwnndict \
 #	Phone \
+#	PinyinIME \
 #	Protips \
+#	SoftKeyboard \
 
 
 # Host tools that are parts of the SDK.
@@ -122,16 +123,18 @@
 $(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk)
 
-$(call inherit-product, $(SRC_TARGET_DIR)/product/locales_full.mk)
-
 # Overrides
 PRODUCT_BRAND := generic
 PRODUCT_NAME := sdk
 PRODUCT_DEVICE := generic
-PRODUCT_LOCALES := \
+
+# locale + densities. en_US is both first and in alphabetical order to
+# ensure this is the default locale.
+PRODUCT_LOCALES = \
 	ldpi \
 	hdpi \
 	mdpi \
+	en_US \
 	ar_EG \
 	ar_IL \
 	bg_BG \