Don't build Exchange1

Change-Id: I0c4e753dfddc1272c3193af360366a8f5aa7d23f
diff --git a/Android.mk b/Android.mk
index aa7cbc7..a325a18 100644
--- a/Android.mk
+++ b/Android.mk
@@ -32,7 +32,7 @@
 
 LOCAL_EMMA_COVERAGE_FILTER += +com.android.exchange.*
 
-include $(BUILD_PACKAGE)
+#include $(BUILD_PACKAGE)
 
 include $(CLEAR_VARS)
 
diff --git a/exchange2/Android.mk b/exchange2/Android.mk
index 24aba9a..a434b8c 100644
--- a/exchange2/Android.mk
+++ b/exchange2/Android.mk
@@ -22,7 +22,7 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon2
+LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon
 LOCAL_STATIC_JAVA_LIBRARIES += calendar-common
 
 LOCAL_PACKAGE_NAME := Exchange2