am 260942fa: Merge "Build with java7 by default."

* commit '260942fa826052f24455dbaf74e54189efb44e8b':
  Build with java7 by default.
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