Adjust to android-test-lib rename.

Change-Id: I009fd942bca11b998039016fec2116d58bd5ef56
diff --git a/instrumentation/Android.mk b/instrumentation/Android.mk
index 22ee642..ffafd03 100644
--- a/instrumentation/Android.mk
+++ b/instrumentation/Android.mk
@@ -16,7 +16,7 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := android-support-multidex-instrumentation
-LOCAL_JAVA_LIBRARIES := android-support-multidex android-test-lib
+LOCAL_JAVA_LIBRARIES := android-support-multidex android-support-test
 LOCAL_SDK_VERSION := 4
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/instrumentation/src/com/android/test/runner/MultiDexAndroidJUnitRunner.java b/instrumentation/src/com/android/test/runner/MultiDexAndroidJUnitRunner.java
index afb6e08..3c3c14a 100644
--- a/instrumentation/src/com/android/test/runner/MultiDexAndroidJUnitRunner.java
+++ b/instrumentation/src/com/android/test/runner/MultiDexAndroidJUnitRunner.java
@@ -16,10 +16,9 @@
 
 package com.android.test.runner;
 
-import com.android.test.runner.AndroidJUnitRunner;
-
 import android.os.Bundle;
 import android.support.multidex.MultiDex;
+import android.support.test.runner.AndroidJUnitRunner;
 
 /**
  * Extends AndroidJUnitRunner to patch up things for GMS Core multi-dex support.