Convert ExchangeTests to use android-support-test

Change-Id: Ie5ca6fa84c8a4617e63a438d995e5cbf9715e516
diff --git a/tests/Android.mk b/tests/Android.mk
index 6055226..989588c 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -32,4 +32,6 @@
 
 LOCAL_INSTRUMENTATION_FOR := Exchange2
 
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+
 include $(BUILD_PACKAGE)
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 6511938..429acd9 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -29,9 +29,9 @@
     <!--
     This declares that this app uses the instrumentation test runner targeting
     the package of com.android.email.  To run the tests use the command:
-    "adb shell am instrument -w com.android.exchange.tests/android.test.InstrumentationTestRunner"
+    "adb shell am instrument -w com.android.exchange.tests/android.support.test.runner.AndroidJUnitRunner"
     -->
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
                      android:targetPackage="com.android.exchange"
                      android:label="Tests for Exchange."/>