am cc2a47bf: Merge "Check existence of both 64-bit and 32-bit module variants."

* commit 'cc2a47bf64b87f228b10c8f83b1575eee2aa1e76':
  Check existence of both 64-bit and 32-bit module variants.
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 2962fd2..5926f19 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -55,17 +55,16 @@
 	QuickSearchBox \
 	WidgetPreview \
 	librs_jni \
+	ConnectivityTest \
+	GpsLocationTest \
 	CalendarProvider \
 	Calendar \
 	SmokeTest \
 	SmokeTestApp \
-	EmulatorSmokeTests \
 	rild \
 	LegacyCamera \
 	Dialer
 
-
-
 # Define the host tools and libs that are parts of the SDK.
 -include sdk/build/product_sdk.mk
 -include development/build/product_sdk.mk