Junit has been moved from luni to junit.

Change-Id: I3c5f38ec3b3ec1da0d776d63f2989069813ee248
diff --git a/tests/core/annotation/Android.mk b/tests/core/annotation/Android.mk
index da44adf..059270b 100644
--- a/tests/core/annotation/Android.mk
+++ b/tests/core/annotation/Android.mk
@@ -24,7 +24,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/annotation/src/test/java) \
-	$(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+	$(call all-java-files-under,../../../../libcore/junit/src/test/java/junit) \
 	$(call all-java-files-under,../../../../libcore/support/src/test/java/)
 
 LOCAL_PACKAGE_NAME := android.core.tests.annotation
diff --git a/tests/core/archive/Android.mk b/tests/core/archive/Android.mk
index 0804b4b..2cc000b 100644
--- a/tests/core/archive/Android.mk
+++ b/tests/core/archive/Android.mk
@@ -24,7 +24,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/archive/src/test/java/org) \
-	$(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+	$(call all-java-files-under,../../../../libcore/junit/src/test/java/junit) \
 	$(call all-java-files-under,../../../../libcore/support/src/test/java)
 
 LOCAL_PACKAGE_NAME := android.core.tests.archive
diff --git a/tests/core/concurrent/Android.mk b/tests/core/concurrent/Android.mk
index 5596dce..5a25563 100644
--- a/tests/core/concurrent/Android.mk
+++ b/tests/core/concurrent/Android.mk
@@ -29,7 +29,7 @@
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
 LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/concurrent/src/test/java) \
-	$(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+	$(call all-java-files-under,../../../../libcore/junit/src/test/java/junit) \
 	$(call all-java-files-under,../../../../libcore/support/src/test/java/)
 
 LOCAL_PACKAGE_NAME := android.core.tests.concurrent
diff --git a/tests/core/crypto/Android.mk b/tests/core/crypto/Android.mk
index ab352a1..6a3e0c4 100644
--- a/tests/core/crypto/Android.mk
+++ b/tests/core/crypto/Android.mk
@@ -24,7 +24,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/crypto/src/test/java) \
-	$(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+	$(call all-java-files-under,../../../../libcore/junit/src/test/java/junit) \
 	$(call all-java-files-under,../../../../libcore/support/src/test/java/)
 
 LOCAL_PACKAGE_NAME := android.core.tests.crypto
diff --git a/tests/core/dom/Android.mk b/tests/core/dom/Android.mk
index b17f38e..10bb38a 100644
--- a/tests/core/dom/Android.mk
+++ b/tests/core/dom/Android.mk
@@ -24,7 +24,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/dom/src/test/java) \
-	$(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+	$(call all-java-files-under,../../../../libcore/junit/src/test/java/junit) \
 	$(call all-java-files-under,../../../../libcore/support/src/test/java/)
 
 LOCAL_PACKAGE_NAME := android.core.tests.dom
diff --git a/tests/core/logging/Android.mk b/tests/core/logging/Android.mk
index f9fe3a5..54c6522 100644
--- a/tests/core/logging/Android.mk
+++ b/tests/core/logging/Android.mk
@@ -24,7 +24,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/logging/src/test/java) \
-	$(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+	$(call all-java-files-under,../../../../libcore/junit/src/test/java/junit) \
 	$(call all-java-files-under,../../../../libcore/support/src/test/java)
 
 LOCAL_PACKAGE_NAME := android.core.tests.logging
diff --git a/tests/core/math/Android.mk b/tests/core/math/Android.mk
index 50ae614..27defce 100644
--- a/tests/core/math/Android.mk
+++ b/tests/core/math/Android.mk
@@ -24,7 +24,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/math/src/test/java) \
-	$(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+	$(call all-java-files-under,../../../../libcore/junit/src/test/java/junit) \
 	$(call all-java-files-under,../../../../libcore/support/src/test/java)
 
 LOCAL_PACKAGE_NAME := android.core.tests.math
diff --git a/tests/core/nio/Android.mk b/tests/core/nio/Android.mk
index 0e4b783..7761a15 100644
--- a/tests/core/nio/Android.mk
+++ b/tests/core/nio/Android.mk
@@ -24,7 +24,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/nio/src/test/java) \
-	$(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+	$(call all-java-files-under,../../../../libcore/junit/src/test/java/junit) \
 	$(call all-java-files-under,../../../../libcore/support/src/test/java)
 
 LOCAL_PACKAGE_NAME := android.core.tests.nio
diff --git a/tests/core/nio_char/Android.mk b/tests/core/nio_char/Android.mk
index 219c26e..3c93934 100644
--- a/tests/core/nio_char/Android.mk
+++ b/tests/core/nio_char/Android.mk
@@ -24,7 +24,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/nio_char/src/test/java) \
-	$(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+	$(call all-java-files-under,../../../../libcore/junit/src/test/java/junit) \
 	$(call all-java-files-under,../../../../libcore/support/src/test/java)
 
 LOCAL_PACKAGE_NAME := android.core.tests.nio_char
diff --git a/tests/core/prefs/Android.mk b/tests/core/prefs/Android.mk
index 605c729..fe9ea6c 100644
--- a/tests/core/prefs/Android.mk
+++ b/tests/core/prefs/Android.mk
@@ -24,7 +24,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/prefs/src/test/java) \
-	$(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+	$(call all-java-files-under,../../../../libcore/junit/src/test/java/junit) \
 	$(call all-java-files-under,../../../../libcore/support/src/test/java)
 
 LOCAL_PACKAGE_NAME := android.core.tests.prefs
diff --git a/tests/core/regex/Android.mk b/tests/core/regex/Android.mk
index c85bc1b..7d04b76 100644
--- a/tests/core/regex/Android.mk
+++ b/tests/core/regex/Android.mk
@@ -24,7 +24,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/regex/src/test/java) \
-	$(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+	$(call all-java-files-under,../../../../libcore/junit/src/test/java/junit) \
 	$(call all-java-files-under,../../../../libcore/support/src/test/java)
 
 LOCAL_PACKAGE_NAME := android.core.tests.regex
diff --git a/tests/core/security/Android.mk b/tests/core/security/Android.mk
index dcc62b7..441e3f4 100644
--- a/tests/core/security/Android.mk
+++ b/tests/core/security/Android.mk
@@ -24,7 +24,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/security/src/test/java) \
-	$(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+	$(call all-java-files-under,../../../../libcore/junit/src/test/java/junit) \
 	$(call all-java-files-under,../../../../libcore/support/src/test/java)
 
 LOCAL_PACKAGE_NAME := android.core.tests.security
diff --git a/tests/core/sql/Android.mk b/tests/core/sql/Android.mk
index b9a0726..b09075b 100644
--- a/tests/core/sql/Android.mk
+++ b/tests/core/sql/Android.mk
@@ -24,7 +24,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/sql/src/test/java) \
-	$(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+	$(call all-java-files-under,../../../../libcore/junit/src/test/java/junit) \
 	$(call all-java-files-under,../../../../libcore/support/src/test/java)
 
 LOCAL_PACKAGE_NAME := android.core.tests.sql
diff --git a/tests/core/text/Android.mk b/tests/core/text/Android.mk
index 3df0af9..03207ba 100644
--- a/tests/core/text/Android.mk
+++ b/tests/core/text/Android.mk
@@ -24,7 +24,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/text/src/test/java) \
-	$(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+	$(call all-java-files-under,../../../../libcore/junit/src/test/java/junit) \
 	$(call all-java-files-under,../../../../libcore/support/src/test/java)
 
 LOCAL_PACKAGE_NAME := android.core.tests.text
diff --git a/tests/core/xml/Android.mk b/tests/core/xml/Android.mk
index 49de09b..c798324 100644
--- a/tests/core/xml/Android.mk
+++ b/tests/core/xml/Android.mk
@@ -25,7 +25,7 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/xml/src/test/java) \
 	$(call all-java-files-under,../../../../libcore/dom/src/test) \
-	$(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+	$(call all-java-files-under,../../../../libcore/junit/src/test/java/junit) \
 	$(call all-java-files-under,../../../../libcore/support/src/test/java)
 
 LOCAL_PACKAGE_NAME := android.core.tests.xml
diff --git a/tests/core/xnet/Android.mk b/tests/core/xnet/Android.mk
index 599c848..455308d 100644
--- a/tests/core/xnet/Android.mk
+++ b/tests/core/xnet/Android.mk
@@ -24,7 +24,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/x-net/src/test/java) \
-	$(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+	$(call all-java-files-under,../../../../libcore/junit/src/test/java/junit) \
 	$(call all-java-files-under,../../../../libcore/support/src/test/java)
 
 LOCAL_PACKAGE_NAME := android.core.tests.xnet