am a355ae12: Merge changes I2c10e41f,I5b5e23f1,If3f5a81c,I07520b75

* commit 'a355ae12506150a7a676956f3c5083f852ba5722':
  build: remove packages/ from 64-bit blacklist
  build: use TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS
  build: add support for LOCAL_MULTILIB := 64
  build: fix TARGET_PREFER_32_BIT
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 0c7d174..79ea492 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -55,15 +55,15 @@
 	QuickSearchBox \
 	WidgetPreview \
 	librs_jni \
+	ConnectivityTest \
+	GpsLocationTest \
 	CalendarProvider \
 	Calendar \
 	SmokeTest \
 	SmokeTestApp \
-	EmulatorSmokeTests \
 	rild \
 	LegacyCamera
 
-
 # Define the host tools and libs that are parts of the SDK.
 -include sdk/build/product_sdk.mk
 -include development/build/product_sdk.mk